upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 00:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have pump() no longer pump events raised while it is running.

Browse Source 
The main way I know of for getting into this situation is hitting
the recursion maximum within pump(), and if that happens you probably
have runaway WML. So it should be better to move on instead of
continuing to process events.
(Normally, events raised within an event handler are pumped before
that event handler exits, so would not be affected by this change.)

I think the old behavior is an artifact of the old implementation,
but I'm making this a separate commit in case removing this causes
problems (easier to diagnose, especially if I'm not the one diagnosing).
This commit is contained in:
JaMiT 2013-08-17 16:43:50 -05:00
parent b4ce6a6b3a
commit e088435d6e
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/game_events/pump.cpp
View File

@ -126,7 +126,7 @@ namespace { // Support functions
// Not sure what the correct thing to do is here. In princple,
// discarding all events (i.e. clearing events_queue) seems like
// the right thing to do in the face of an exeption. However, the
// the right thing to do in the face of an exception. However, the
// previous functionality preserved the queue, so for now we will
// restore it.
if ( !done() ) {
@ -481,7 +481,6 @@ bool pump()
// while events are being processed.
wb::real_map real_unit_map;
{ // Scope limitation for pump_manager
pump_manager pump_instance;
// Loop through the events we need to process.
@ -530,23 +529,12 @@ bool pump()
// Only commit new handlers when finished iterating over event_handlers.
commit();
}
} // Scope limitation for pump_manager
if ( old_wml_track != internal_wml_tracking )
// Notify the whiteboard of any event.
// This is used to track when moves, recruits, etc. happen.
resources::whiteboard->on_gamestate_change();
// The previous version of this would iterate through all events, including
// those raised, but not pumped, while this function is executing. This
// should not actually occur, but to preserve this behavior, initiate a
// recursion.
// (I think I'll remove this bit shortly, but at least this will allow
// that to be done in a separate source code commit.)
if ( !events_queue.empty() )
if ( pump() )
result = true;
return result;
}