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

fixed bug where killing an enemy that caused an [endlevel] event to occur...

Browse source 
... prevented advancement by the unit killing
This commit is contained in:
uid68803 2004-02-02 15:31:18 +00:00
parent 06ae08353b
commit f52e2e0df2
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/playturn.cpp
View file

@ -567,8 +567,16 @@ void turn_info::left_click(const SDL_MouseButtonEvent& event)
recorder.add_attack(selected_hex_,hex,res);
attack(gui_,map_,teams_,selected_hex_,hex,res,units_,
status_,gameinfo_,true);
try {
attack(gui_,map_,teams_,selected_hex_,hex,res,units_,
status_,gameinfo_,true);
} catch(end_level_exception&) {
//if the level ends due to a unit being killed, still see if
//either the attacker or defender should advance
dialogs::advance_unit(gameinfo_,units_,selected_hex_,gui_);
dialogs::advance_unit(gameinfo_,units_,hex,gui_,!defender_human);
throw;
}
dialogs::advance_unit(gameinfo_,units_,selected_hex_,gui_);
dialogs::advance_unit(gameinfo_,units_,hex,gui_,!defender_human);