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

Reverted the fix esr made, on my suggestion, for bug #9817

Browse source 
...the bugs weren't there.

Fixed the scenario by calling redraw.

Fixed redraw to also update the terrain if required.

The [terrain_mask] now also uses the normal update framework.

This fixes bug #9817 properly.
This commit is contained in:
Mark de Wever 2007-08-31 16:18:06 +00:00
parent 417fa9295a
commit e9d4ac4979
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -1,4 +1,8 @@
Version 1.3.7+svn:
* Campaigns
* Son of the Black Eye
* Fixed bug in 'Saving Inarix' where the blown up bridge wasn't shown
properly (bug #9817)
* language and i18n:
* updated translations: Bulgarian, Danish, Dutch, Finnish, French, German,
Polish, Swedish

1
data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
View file

@ -26,6 +26,7 @@
y=12,13,14,13,14,12,13,14
letter=Ww
[/terrain]
[redraw][/redraw]
[kill]
x=18,18,18,19,19,20,20,20
y=12,13,14,13,14,12,13,14

2
players_changelog
View file

@ -4,6 +4,8 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
Version 1.3.7+svn:
* Campaigns
* Son of the Black Eye
* Fixed bug in 'Saving Inarix', the bridge is now properly blown up.
* Graphics
* New graphics for Highwayman.

12
src/game_events.cpp
View file

@ -1334,8 +1334,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
game_map->set_terrain(*loc,terrain);
}
// rebuild_screen_ = true;
screen->rebuild_all();
rebuild_screen_ = true;
}
}
@ -1353,9 +1352,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
}
game_map->overlay(mask, cfg.get_parsed_config(), loc.x, loc.y);
screen->recalculate_minimap();
screen->invalidate_all();
screen->rebuild_all();
rebuild_screen_ = true;
}
// If we should spawn a new unit on the map somewhere
@ -2073,6 +2070,11 @@ bool event_handler::handle_event_command(const queued_event& event_info,
recalculate_fog(*game_map,*status_ptr,*game_data_ptr,*units,*teams,side_num-1);
screen->recalculate_minimap();
}
if(rebuild_screen_) {
rebuild_screen_ = false;
screen->recalculate_minimap();
screen->rebuild_all();
}
screen->invalidate_all();
screen->draw(true,true);
}