[Gemrb-commits] gemrb: branch master updated. 6b32f4d1a99bcec7105c5dc262b01849ca632cf2

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  6b32f4d1a99bcec7105c5dc262b01849ca632cf2 (commit)

Summary of changes:
 gemrb/core/GameScript/Actions.cpp |    1 -
 gemrb/core/Interface.cpp          |   11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
      from  e6338f9d66eac4ff31ea629bd9286b6d65d1857c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=6b32f4d1a99bcec7105c5dc262b01849ca632cf2

commit 6b32f4d1a99bcec7105c5dc262b01849ca632cf2
Author: Tom Prince <tom...@ua...>
Date:   Tue Jun 29 10:47:35 2010 -0600

    GUIScript: Remove last calls of one argument ScriptEngine::RunFunction in core.
    
    There is one remaining call in GemRB.RunEventHandler. Once the bg1-import-cleanup
    branch is merged, the one argument RunFunction, Set*EventByName and RunEventHandler
    can all go away.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/GameScript/Actions.cpp b/gemrb/core/GameScript/Actions.cpp
index ba698fd..735d027 100644
--- a/gemrb/core/GameScript/Actions.cpp
+++ b/gemrb/core/GameScript/Actions.cpp
@@ -4988,7 +4988,6 @@ void GameScript::StartStore( Scriptable* Sender, Action* parameters)
 		return;
 	}
 	core->SetCurrentStore( parameters->string0Parameter, Sender->GetScriptName());
-	//core->GetGUIScriptEngine()->RunFunction( "OpenStoreWindow" );
 	core->SetEventFlag(EF_OPENSTORE);
 	//sorry, i have absolutely no idea when i should do this :)
 	Sender->ReleaseCurrentAction();
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index f90e9c5..973786a 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -459,7 +459,7 @@ GameControl* Interface::StartGameControl()
 	//setting the focus to the game control
 	evntmgr->SetFocused(gamewin, gc);
 	if (guiscript->LoadScript( "MessageWindow" )) {
-		guiscript->RunFunction( "OnLoad" );
+		guiscript->RunFunction( "MessageWindow", "OnLoad" );
 		gc->UnhideGUI();
 	}
 
@@ -508,7 +508,7 @@ void Interface::HandleEvents()
 
 	if ((EventFlag&EF_CONTROL) && gc) {
 		EventFlag&=~EF_CONTROL;
-		guiscript->RunFunction( "UpdateControlStatus" );
+		guiscript->RunFunction( "MessageWindow", "UpdateControlStatus" );
 		//this is the only value we can use here
 		if (game->ControlStatus & CS_HIDEGUI)
 			gc->HideGUI();
@@ -534,7 +534,8 @@ void Interface::HandleEvents()
 
 	if (EventFlag&EF_IDENTIFY) {
 		EventFlag&=~EF_IDENTIFY;
-		guiscript->RunFunction( "OpenIdentifyWindow" );
+		// FIXME: Implement this.
+		guiscript->RunFunction( "GUICommonWindows", "OpenIdentifyWindow" );
 		return;
 	}
 	if (EventFlag&EF_OPENSTORE) {
@@ -545,7 +546,7 @@ void Interface::HandleEvents()
 
 	if (EventFlag&EF_MASTERSCRIPT) {
 		EventFlag&=~EF_MASTERSCRIPT;
-		guiscript->RunFunction( "UpdateMasterScript" );
+		guiscript->RunFunction( "MessageWindow", "UpdateMasterScript" );
 		return;
 	}
 
@@ -595,7 +596,7 @@ void Interface::HandleFlags()
 	if (QuitFlag&QF_CHANGESCRIPT) {
 		QuitFlag &= ~QF_CHANGESCRIPT;
 		guiscript->LoadScript( NextScript );
-		guiscript->RunFunction( "OnLoad" );
+		guiscript->RunFunction( NextScript, "OnLoad" );
 	}
 }
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator