Author: mordante
Date: Sun May 27 12:13:28 2007
New Revision: 17901
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17901&view=rev
Log:
got rid of display::map_w() and now uses the value from the theme code
Modified:
trunk/src/display.cpp
trunk/src/display.hpp
trunk/src/editor/editor_layout.cpp
Modified: trunk/src/display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.cpp?rev=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- trunk/src/display.cpp (original)
+++ trunk/src/display.cpp Sun May 27 12:13:28 2007
@@ -2488,7 +2488,7 @@
msg = message;
action = false;
}
- msg = font::word_wrap_text(msg,font::SIZE_SMALL,map_w()*3/4);
+ msg =
font::word_wrap_text(msg,font::SIZE_SMALL,map_area().w*3/4);
int ypos = chat_message_x;
for(std::vector<chat_message>::const_iterator m =
chat_messages_.begin(); m != chat_messages_.end(); ++m) {
Modified: trunk/src/display.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.hpp?rev=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- trunk/src/display.hpp (original)
+++ trunk/src/display.hpp Sun May 27 12:13:28 2007
@@ -126,7 +126,6 @@
//width of the portion of the display which shows the game area. Between
//mapx and x is the sidebar region.
int w() const { return screen_.getx(); }
- int map_w() const { return w() - 140; }
int h() const { return screen_.gety(); }
const SDL_Rect& map_area() const
Modified: trunk/src/editor/editor_layout.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor_layout.cpp?rev=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- trunk/src/editor/editor_layout.cpp (original)
+++ trunk/src/editor/editor_layout.cpp Sun May 27 12:13:28 2007
@@ -35,9 +35,9 @@
}
void adjust_sizes(const display &disp, size_specs &sizes) {
- sizes.brush_x = disp.map_w() + 23;
+ sizes.brush_x = disp.map_area().w + 23;
sizes.brush_y = 190;
- sizes.palette_x = disp.map_w() + 13;
+ sizes.palette_x = disp.map_area().w + 13;
sizes.palette_y = sizes.brush_y + 160 + 10;
sizes.palette_w = sizes.terrain_space * default_palette_width;
sizes.palette_h = disp.h() - sizes.palette_y - 60;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
