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

fixes

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-25 04:37:27 +00:00
parent 921c1446c4
commit 2d97c8e0ca
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+8 -2
View File
@@ -292,7 +292,7 @@ bool LuaManager::RunScript( const CString &sScript, const CString &sName, CStrin
bool LuaManager::RunScript( const CString &sExpression, const CString &sName, int iReturnValues ) bool LuaManager::RunScript( const CString &sExpression, const CString &sName, int iReturnValues )
{ {
CString sError; CString sError;
if( !RunScript( sExpression, sName.size()? sName:"in", sError, iReturnValues ) ) if( !RunScript( sExpression, sName.size()? sName:CString("in"), sError, iReturnValues ) )
{ {
sError = ssprintf( "Lua runtime error parsing \"%s\": %s", sName.size()? sName.c_str():sExpression.c_str(), sError.c_str() ); sError = ssprintf( "Lua runtime error parsing \"%s\": %s", sName.size()? sName.c_str():sExpression.c_str(), sError.c_str() );
Dialog::OK( sError, "LUA_ERROR" ); Dialog::OK( sError, "LUA_ERROR" );
@@ -406,7 +406,13 @@ LuaFunction_NoArgs( Year, GetLocalTime().tm_year+1900 );
LuaFunction_NoArgs( Weekday, GetLocalTime().tm_wday ); LuaFunction_NoArgs( Weekday, GetLocalTime().tm_wday );
LuaFunction_NoArgs( DayOfYear, GetLocalTime().tm_yday ); LuaFunction_NoArgs( DayOfYear, GetLocalTime().tm_yday );
LuaFunction_Str( Trace, (LOG->Trace("%s", str.c_str()),true) ); static bool Trace( const CString &sString )
{
LOG->Trace( "%s", sString.c_str() );
return true;
}
LuaFunction_Str( Trace, Trace(str) );
/* /*
* (c) 2004 Glenn Maynard * (c) 2004 Glenn Maynard
stepmania/src/LuaManager.h
+3 -2
View File
@@ -6,6 +6,9 @@
struct lua_State; struct lua_State;
typedef void (*RegisterWithLuaFn)(lua_State*); typedef void (*RegisterWithLuaFn)(lua_State*);
class LuaManager;
extern LuaManager *LUA;
namespace LuaHelpers namespace LuaHelpers
{ {
template<class T> template<class T>
@@ -133,8 +136,6 @@ public:
} }
} }
extern LuaManager *LUA;
#define REGISTER_WITH_LUA_FUNCTION( Fn ) \ #define REGISTER_WITH_LUA_FUNCTION( Fn ) \
class Register##Fn { public: Register##Fn() { LuaManager::Register( Fn ); } }; \ class Register##Fn { public: Register##Fn() { LuaManager::Register( Fn ); } }; \
static Register##Fn register##Fn; static Register##Fn register##Fn;