From: <ave...@us...> - 2009-09-18 14:43:21
|
Revision: 7201 http://gemrb.svn.sourceforge.net/gemrb/?rev=7201&view=rev Author: avenger_teambg Date: 2009-09-18 14:43:11 +0000 (Fri, 18 Sep 2009) Log Message: ----------- fixed a freed pointer reference (never do ReleaseCurrentAction before EscapeAreaCore) Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Actions.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Actions.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-09-18 14:28:44 UTC (rev 7200) +++ gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2009-09-18 14:43:11 UTC (rev 7201) @@ -5445,7 +5445,6 @@ map->TMap->AdjustNearestTravel(p); Sender->SetWait(5); - Sender->ReleaseCurrentAction(); if (parameters->string0Parameter[0]) { Point q((short) parameters->int0Parameter, (short) parameters->int1Parameter); @@ -5453,6 +5452,7 @@ } else { EscapeAreaCore((Actor *) Sender, parameters->string0Parameter, p, p, EA_DESTROY ); } + Sender->ReleaseCurrentAction(); } void GameScript::EscapeAreaDestroy(Scriptable* Sender, Action* parameters) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |