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

warn, don't throw on Lua errors

Browse Source
This commit is contained in:
Chris Danford
2004-11-07 10:36:59 +00:00
parent df87e9794b
commit 936dfd4d9d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaHelpers.cpp
+5 -6
View File
@@ -4,6 +4,7 @@
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "arch/Dialog/Dialog.h"
#include <csetjmp> #include <csetjmp>
#include <cassert> #include <cassert>
@@ -107,7 +108,8 @@ void LoadFromString( lua_State *L, const CString &str )
{ {
CString err; CString err;
Lua::PopStack( L, err ); Lua::PopStack( L, err );
RageException::Throw( "Error loading script \"%s\": %s", str.c_str(), err.c_str() ); CString sError = ssprintf( "Runtime error running \"%s\": %s", str.c_str(), err.c_str() );
Dialog::OK( sError, "LUA_ERROR" );
} }
} }
@@ -193,10 +195,6 @@ void Lua::PrepareExpression( CString &sInOut )
// comment out HTML style color values // comment out HTML style color values
sInOut.Replace( "#", "--" ); sInOut.Replace( "#", "--" );
// HACK: Some actor commands ("screen,") have illegal Lua characters.
sInOut.Replace( " ", "" );
sInOut.Replace( "/", "" );
// Remove leading +, eg. "+50"; Lua doesn't handle that. // Remove leading +, eg. "+50"; Lua doesn't handle that.
if( sInOut.size() >= 1 && sInOut[0] == '+' ) if( sInOut.size() >= 1 && sInOut[0] == '+' )
sInOut.erase( 0, 1 ); sInOut.erase( 0, 1 );
@@ -212,7 +210,8 @@ void RunExpression( const CString &str )
{ {
CString err; CString err;
Lua::PopStack( L, err ); Lua::PopStack( L, err );
RageException::Throw( "Runtime error running \"%s\": %s", str.c_str(), err.c_str() ); CString sError = ssprintf( "Runtime error running \"%s\": %s", str.c_str(), err.c_str() );
Dialog::OK( sError, "LUA_ERROR" );
} }
ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) );