From: <fu...@us...> - 2009-07-03 08:13:30
|
Revision: 6674 http://gemrb.svn.sourceforge.net/gemrb/?rev=6674&view=rev Author: fuzzie Date: 2009-07-02 14:53:27 +0000 (Thu, 02 Jul 2009) Log Message: ----------- add CurrentActionState to Scriptable Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp gemrb/trunk/gemrb/plugins/Core/ActorBlock.h Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-07-01 21:38:36 UTC (rev 6673) +++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp 2009-07-02 14:53:27 UTC (rev 6674) @@ -64,6 +64,7 @@ LastPickLockFailed = 0; DialogName = 0; CurrentAction = NULL; + CurrentActionState = 0; UnselectableTimer = 0; startTime = 0; //executing scripts lastRunTime = 0; //evaluating scripts @@ -371,6 +372,8 @@ CurrentAction->Release(); CurrentAction = NULL; } + + CurrentActionState = 0; } ieWord Scriptable::GetGlobalID() Modified: gemrb/trunk/gemrb/plugins/Core/ActorBlock.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ActorBlock.h 2009-07-01 21:38:36 UTC (rev 6673) +++ gemrb/trunk/gemrb/plugins/Core/ActorBlock.h 2009-07-02 14:53:27 UTC (rev 6674) @@ -207,6 +207,7 @@ ieDword LastPickLockFailed; std::list< Action*> actionQueue; Action* CurrentAction; + int CurrentActionState; unsigned long playDeadCounter; Point LastTargetPos; int SpellHeader; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |