From 6bfb3f0bad4cdbfe81fff4576857c7ebb970970c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 15 Jun 2005 08:33:26 +0000 Subject: [PATCH] pass L to LuaHelpers::TypeError --- stepmania/src/LuaBinding.h | 2 +- stepmania/src/LuaManager.cpp | 10 +++++----- stepmania/src/LuaManager.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/LuaBinding.h b/stepmania/src/LuaBinding.h index 7b082a23e7..cd37e5bcf3 100644 --- a/stepmania/src/LuaBinding.h +++ b/stepmania/src/LuaBinding.h @@ -85,7 +85,7 @@ public: if( bIsSelf ) luaL_typerror( L, narg, s_className ); else - LuaHelpers::TypeError( narg, s_className ); + LuaHelpers::TypeError( L, narg, s_className ); } return pUserdata->pT; // pointer to T object diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index 8361cbc3f4..7a21611a80 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -414,13 +414,13 @@ void LuaManager::Fail( const CString &err ) /* Like luaL_typerror, but without the special case for argument 1 being "self" * in method calls, so we give a correct error message after we remove self. */ -int LuaHelpers::TypeError( int iArgNo, const char *szName ) +int LuaHelpers::TypeError( Lua *L, int iArgNo, const char *szName ) { lua_Debug debug; - lua_getstack( LUA->L, 0, &debug ); - lua_getinfo( LUA->L, "n", &debug ); - return luaL_error( LUA->L, "bad argument #%d to \"%s\" (%s expected, got %s)", - iArgNo, debug.name? debug.name:"(unknown)", szName, lua_typename(LUA->L, lua_type(LUA->L, iArgNo)) ); + lua_getstack( L, 0, &debug ); + lua_getinfo( L, "n", &debug ); + return luaL_error( L, "bad argument #%d to \"%s\" (%s expected, got %s)", + iArgNo, debug.name? debug.name:"(unknown)", szName, lua_typename(L, lua_type(L, iArgNo)) ); } diff --git a/stepmania/src/LuaManager.h b/stepmania/src/LuaManager.h index e7f4f0e375..eb0213c003 100644 --- a/stepmania/src/LuaManager.h +++ b/stepmania/src/LuaManager.h @@ -149,7 +149,7 @@ namespace LuaHelpers } } - int TypeError( int narg, const char *tname ); + int TypeError( Lua *L, int narg, const char *tname ); }