0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better validate the map area size.

Browse source 
This fixes the result of bug #13420 (the cause still needs to be fixed).
This commit is contained in:
Mark de Wever 2009-04-29 18:47:10 +00:00
parent 48b7b8ee7c
commit d46b98fb3f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/widgets/window.cpp
View file

@ -150,17 +150,20 @@ void twindow::update_screen_size()
settings::screen_width = rect.w;
settings::screen_height = rect.h;
settings::gamemap_width = settings::screen_width;
settings::gamemap_height = settings::screen_height;
game_display* display = game_display::get_singleton();
if(display) {
settings::gamemap_width = display->map_outside_area().w;
settings::gamemap_height = display->map_outside_area().h;
} else {
settings::gamemap_width = settings::screen_width;
settings::gamemap_height = settings::screen_height;
const unsigned w = display->map_outside_area().w;
const unsigned h = display->map_outside_area().h;
if(w && h) {
settings::gamemap_width = w;
settings::gamemap_height = h;
}
}
}
}
twindow::tretval twindow::get_retval_by_id(const std::string& id)
{
/*WIKI