From: <fu...@us...> - 2009-08-23 12:48:35
|
Revision: 7027 http://gemrb.svn.sourceforge.net/gemrb/?rev=7027&view=rev Author: fuzzie Date: 2009-08-23 12:48:25 +0000 (Sun, 23 Aug 2009) Log Message: ----------- MoveToObjectCore and BeginDialog also need to store marked objects Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp Modified: gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp 2009-08-23 06:52:56 UTC (rev 7026) +++ gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp 2009-08-23 12:48:25 UTC (rev 7027) @@ -1030,10 +1030,10 @@ printf("BeginDialog core\n"); } if (Flags & BD_OWN) { - tar = GetActorFromObject( Sender, parameters->objects[1], seeflag); + tar = GetStoredActorFromObject( Sender, parameters->objects[1], seeflag); scr = tar; } else { - tar = GetActorFromObject( Sender, parameters->objects[1], seeflag); + tar = GetStoredActorFromObject( Sender, parameters->objects[1], seeflag); scr = Sender; } if (!scr) { @@ -1277,7 +1277,7 @@ Sender->ReleaseCurrentAction(); return; } - Scriptable* target = GetActorFromObject( Sender, parameters->objects[1] ); + Scriptable* target = GetStoredActorFromObject( Sender, parameters->objects[1] ); if (!target) { Sender->ReleaseCurrentAction(); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |