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

Escape no longer disables messages permanently.

Browse source 
Fixes bug #12959. Sapient the bug was old and since you're quite
familiar with the event code please review this patch.
This commit is contained in:
Mark de Wever 2009-02-15 18:58:08 +00:00
parent 24651f07e9
commit ba1861919f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -50,6 +50,8 @@
* Fixed the :query command to work while in a multiplayer game, not only
when in chat (as /query)
* Fixed invalid memory access with AMLAs (bug #12911)
* Closing a message with escape caused the message to skip on the next
execution of that event (unless it required input)
Version 1.5.9:
* Campaigns:

5
src/game_events.cpp
View file

@ -3399,7 +3399,10 @@ static bool process_event(game_events::event_handler& handler, const game_events
return false;
}
// The event hasn't been filtered out, so execute the handler
// The event hasn't been filtered out, so execute the handler.
// First reset the skip_messages to avoid the escape of the previous event
// to be carried over into the next.
handler.skip_messages() = false;
const bool res = handler.handle_event(ev);
if(ev.name == "select") {
state_of_game->last_selected = ev.loc1;