From: <fu...@us...> - 2009-10-03 19:22:06
|
Revision: 7348 http://gemrb.svn.sourceforge.net/gemrb/?rev=7348&view=rev Author: fuzzie Date: 2009-10-03 19:22:00 +0000 (Sat, 03 Oct 2009) Log Message: ----------- don't release an action we still need Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/GameScript.cpp Modified: gemrb/trunk/gemrb/plugins/Core/GameScript.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2009-10-03 18:51:16 UTC (rev 7347) +++ gemrb/trunk/gemrb/plugins/Core/GameScript.cpp 2009-10-03 19:22:00 UTC (rev 7348) @@ -3113,9 +3113,9 @@ printMessage("GameScript"," ",YELLOW); printf("Sender: %s-->override: %s\n",Sender->GetScriptName(), scr->GetScriptName() ); } - scr->ReleaseCurrentAction(); //Sender->CurrentAction scr->AddAction(ParamCopyNoOverride(aC)); + scr->ReleaseCurrentAction(); // goes after AddAction, otherwise we might delete aC! // there are plenty of places where it's vital that ActionOverride is not interrupted and if // there are actions left on the queue after the release above, we can't instant-execute, // so this is my best guess for now.. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |