From: <fu...@us...> - 2009-06-22 14:29:09
|
Revision: 6574 http://gemrb.svn.sourceforge.net/gemrb/?rev=6574&view=rev Author: fuzzie Date: 2009-06-22 14:28:58 +0000 (Mon, 22 Jun 2009) Log Message: ----------- don't destroy actors before they've had a chance to run a death script Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Actor.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-06-22 13:29:28 UTC (rev 6573) +++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-06-22 14:28:58 UTC (rev 6574) @@ -2577,6 +2577,7 @@ game->SelectActor(this, false, SELECT_NORMAL); game->OutAttack(GetID()); + ClearActions(); ClearPath(); SetModal( 0 ); DisplayStringCore(this, VB_DIE, DS_CONSOLE|DS_CONST ); @@ -2637,7 +2638,7 @@ return true; } if (InternalFlags&IF_JUSTDIED) { - if (GetNextAction()) { + if (lastRunTime == 0 || GetNextAction()) { return false; //actor is currently dying, let him die first } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |