From de845e00b8777923c9e2888a2c262dc98609d6a9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 20 Feb 2007 01:17:42 +0000
Subject: [PATCH] use RunScriptOnStack

---
 stepmania/src/DynamicActorScroller.cpp | 12 ++++++++++--
 stepmania/src/MenuTimer.cpp            |  5 ++++-
 stepmania/src/PercentageDisplay.cpp    |  4 +++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/DynamicActorScroller.cpp b/stepmania/src/DynamicActorScroller.cpp
index 1ace808767..636c3068cc 100644
--- a/stepmania/src/DynamicActorScroller.cpp
+++ b/stepmania/src/DynamicActorScroller.cpp
@@ -3,6 +3,7 @@
 #include "XmlFile.h"
 #include "LuaManager.h"
 #include "ActorUtil.h"
+#include "RageLog.h"
 #include "RageUtil.h"
 #include "LuaBinding.h"
 
@@ -41,7 +42,10 @@ void DynamicActorScroller::LoadFromNode( const XNode *pNode )
 		ASSERT( !lua_isnil(L, -1) );
 		lua_pushnil( L );
 		lua_pushnil( L );
-		lua_call( L, 2, 1 ); // 2 args, 1 results
+
+		RString sError;
+		if( !LuaHelpers::RunScriptOnStack(L, sError, 2, 1) ) // 2 args, 1 result
+			LOG->Warn( "Error running LoadFunction: %s", sError.c_str() );
 
 		m_iNumItems = (int) luaL_checknumber( L, -1 );
 		lua_pop( L, 1 );
@@ -117,7 +121,11 @@ void DynamicActorScroller::ConfigureActor( Actor *pActor, int iItem )
 	ASSERT( !lua_isnil(L, -1) );
 	pActor->PushSelf( L );
 	LuaHelpers::Push( L, iItem );
-	lua_call( L, 2, 0 ); // 2 args, 0 results
+
+	RString sError;
+	if( !LuaHelpers::RunScriptOnStack(L, sError, 2, 0) ) // 2 args, 0 results
+		LOG->Warn( "Error running LoadFunction: %s", sError.c_str() );
+
 	LUA->Release(L);
 }
 
diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index 77591151a0..32e2f834b4 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "MenuTimer.h"
+#include "RageLog.h"
 #include "RageUtil.h"
 #include "ScreenManager.h"
 #include "ThemeManager.h"
@@ -165,7 +166,9 @@ void MenuTimer::SetText( float fSeconds )
 		LuaHelpers::Push( L, fSeconds );
 		
 		// call function with 1 argument and 1 result
-		lua_call(L, 1, 1); 
+		RString sError;
+		if( !LuaHelpers::RunScriptOnStack(L, sError, 1, 1) )
+			LOG->Warn( "Error running Text%iFormatFunction: %s", i+1, sError.c_str() );
 
 		RString sText;
 		LuaHelpers::Pop( L, sText );
diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index d5eb417659..d532e21629 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -168,7 +168,9 @@ void PercentageDisplay::Refresh()
 			m_Format.PushSelf( L );
 			ASSERT( !lua_isnil(L, -1) );
 			LuaHelpers::Push( L, fPercentDancePoints );
-			lua_call( L, 1, 1 ); // 1 args, 1 result
+			RString sError;
+			if( !LuaHelpers::RunScriptOnStack(L, sError, 1, 1) ) // 1 arg, 1 result
+				LOG->Warn( "Error running FormatPercentScore: %s", sError.c_str() );
 			LuaHelpers::Pop( L, sNumToDisplay );
 			LUA->Release(L);