actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-21 07:25:38 +00:00
parent 175ae8cac4
commit 6ad2454400
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+16 -16
View File
@@ -60,7 +60,7 @@ void LuaManager::SetGlobal( const RString &sName, int val )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
LuaHelpers::Push( val, L ); LuaHelpers::Push( val, L );
lua_setglobal( L, sName ); lua_setglobal( L, sName );
LUA->Release(L); LUA->Release( L );
} }
void LuaManager::SetGlobal( const RString &sName, float val ) void LuaManager::SetGlobal( const RString &sName, float val )
@@ -68,7 +68,7 @@ void LuaManager::SetGlobal( const RString &sName, float val )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
LuaHelpers::Push( val, L ); LuaHelpers::Push( val, L );
lua_setglobal( L, sName ); lua_setglobal( L, sName );
LUA->Release(L); LUA->Release( L );
} }
void LuaManager::SetGlobal( const RString &sName, bool val ) void LuaManager::SetGlobal( const RString &sName, bool val )
@@ -76,7 +76,7 @@ void LuaManager::SetGlobal( const RString &sName, bool val )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
LuaHelpers::Push( val, L ); LuaHelpers::Push( val, L );
lua_setglobal( L, sName ); lua_setglobal( L, sName );
LUA->Release(L); LUA->Release( L );
} }
void LuaManager::SetGlobal( const RString &sName, const RString &val ) void LuaManager::SetGlobal( const RString &sName, const RString &val )
@@ -84,7 +84,7 @@ void LuaManager::SetGlobal( const RString &sName, const RString &val )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
LuaHelpers::Push( val, L ); LuaHelpers::Push( val, L );
lua_setglobal( L, sName ); lua_setglobal( L, sName );
LUA->Release(L); LUA->Release( L );
} }
void LuaManager::UnsetGlobal( const RString &sName ) void LuaManager::UnsetGlobal( const RString &sName )
@@ -92,7 +92,7 @@ void LuaManager::UnsetGlobal( const RString &sName )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
lua_pushnil( L ); lua_pushnil( L );
lua_setglobal( L, sName ); lua_setglobal( L, sName );
LUA->Release(L); LUA->Release( L );
} }
@@ -220,7 +220,7 @@ Lua *LuaManager::Get()
m_pLock->Lock(); m_pLock->Lock();
if( size_t(g_iNumStackCounts) < ARRAYLEN(g_iStackCounts) ) if( size_t(g_iNumStackCounts) < ARRAYLEN(g_iStackCounts) )
{ {
g_iStackCounts[g_iNumStackCounts] = lua_gettop(L); g_iStackCounts[g_iNumStackCounts] = lua_gettop( L );
} }
++g_iNumStackCounts; ++g_iNumStackCounts;
return L; return L;
@@ -476,12 +476,12 @@ bool LuaHelpers::RunScriptFile( const RString &sFile )
RString sError; RString sError;
if( !LuaHelpers::RunScript( L, sScript, sFile, sError, 0 ) ) if( !LuaHelpers::RunScript( L, sScript, sFile, sError, 0 ) )
{ {
LUA->Release(L); LUA->Release( L );
sError = ssprintf( "Lua runtime error: %s", sError.c_str() ); sError = ssprintf( "Lua runtime error: %s", sError.c_str() );
Dialog::OK( sError, "LUA_ERROR" ); Dialog::OK( sError, "LUA_ERROR" );
return false; return false;
} }
LUA->Release(L); LUA->Release( L );
return true; return true;
} }
@@ -535,7 +535,7 @@ bool LuaHelpers::RunExpressionB( const RString &str )
if( !LuaHelpers::RunScript(L, "return " + str, "", 1) ) if( !LuaHelpers::RunScript(L, "return " + str, "", 1) )
{ {
LUA->Release(L); LUA->Release( L );
return false; return false;
} }
@@ -545,7 +545,7 @@ bool LuaHelpers::RunExpressionB( const RString &str )
bool result = !!lua_toboolean( L, -1 ); bool result = !!lua_toboolean( L, -1 );
lua_pop( L, 1 ); lua_pop( L, 1 );
LUA->Release(L); LUA->Release( L );
return result; return result;
} }
@@ -555,7 +555,7 @@ float LuaHelpers::RunExpressionF( const RString &str )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
if( !LuaHelpers::RunScript(L, "return " + str, "", 1) ) if( !LuaHelpers::RunScript(L, "return " + str, "", 1) )
{ {
LUA->Release(L); LUA->Release( L );
return 0; return 0;
} }
@@ -566,7 +566,7 @@ float LuaHelpers::RunExpressionF( const RString &str )
float result = (float) lua_tonumber( L, -1 ); float result = (float) lua_tonumber( L, -1 );
lua_pop( L, 1 ); lua_pop( L, 1 );
LUA->Release(L); LUA->Release( L );
return result; return result;
} }
@@ -580,7 +580,7 @@ bool LuaHelpers::RunExpressionS( const RString &str, RString &sOut )
Lua *L = LUA->Get(); Lua *L = LUA->Get();
if( !LuaHelpers::RunScript(L, "return " + str, "", 1) ) if( !LuaHelpers::RunScript(L, "return " + str, "", 1) )
{ {
LUA->Release(L); LUA->Release( L );
return false; return false;
} }
@@ -591,7 +591,7 @@ bool LuaHelpers::RunExpressionS( const RString &str, RString &sOut )
sOut = lua_tostring( L, -1 ); sOut = lua_tostring( L, -1 );
lua_pop( L, 1 ); lua_pop( L, 1 );
LUA->Release(L); LUA->Release( L );
return true; return true;
} }
@@ -616,14 +616,14 @@ RString GetLuaBindingType( Lua *L, int iArgNo )
if( lua_isnil(L, iArgNo) ) if( lua_isnil(L, iArgNo) )
return "nil"; return "nil";
int iTop = lua_gettop(L); int iTop = lua_gettop( L );
if( !lua_getmetatable(L, iArgNo) ) if( !lua_getmetatable(L, iArgNo) )
{ {
lua_settop( L, iTop ); lua_settop( L, iTop );
return ssprintf( "non-bound %s", lua_typename(L, lua_type(L, iArgNo)) ); return ssprintf( "non-bound %s", lua_typename(L, lua_type(L, iArgNo)) );
} }
int iMetatable = lua_gettop(L); int iMetatable = lua_gettop( L );
lua_pushstring( L, "type" ); lua_pushstring( L, "type" );
lua_rawget( L, iMetatable ); lua_rawget( L, iMetatable );
RString sActualType = lua_tostring( L, -1 ); RString sActualType = lua_tostring( L, -1 );
stepmania/src/LuaManager.h
+2 -2
View File
@@ -134,8 +134,8 @@ namespace LuaHelpers
inline bool MyLua_checkboolean (lua_State *L, int numArg) inline bool MyLua_checkboolean (lua_State *L, int numArg)
{ {
luaL_checktype(L,numArg,LUA_TBOOLEAN); luaL_checktype( L, numArg, LUA_TBOOLEAN );
return !!lua_toboolean(L,numArg); return !!lua_toboolean( L, numArg );
} }
#define SArg(n) (luaL_checkstring(L,n)) #define SArg(n) (luaL_checkstring(L,n))