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

Moved error reporting to ScreenSystemLayer error.lua. ScreenSystemLayer overlay/default.lua restored to previous. Error messages are now broadcast with the ScriptError message instead of SystemMessage. Added show/hide error messages toggle and clear error messages to debug menu. Nuked ScreenConsoleOverlay for being unfinished and duplicating ScreenSystemLayer. Changed Actor:tween and Tween::CreateFromStack to use ReportScriptError on invalid tween params. Changed some OptionRowList things to use ReportScriptError on invalid metrics.

Browse Source
This commit is contained in:
Kyzentun
2014-07-08 20:01:33 -06:00
committed by Jonathan Payne
parent 8e74a512ad
commit cc548a8cb5
13 changed files with 321 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OptionRowHandler.cpp
+21 -6
View File
@@ -153,7 +153,10 @@ public:
// Parse the basic configuration metric.
Commands lCmds = ParseCommands( ENTRY(sParam) );
if( lCmds.v.size() < 1 )
RageException::Throw( "Parse error in \"ScreenOptionsMaster::%s\".", sParam.c_str() );
{
LuaHelpers::ReportScriptErrorFmt("Parse error in \"ScreenOptionsMaster::%s\".", sParam.c_str());
lCmds= ParseCommands("0");
}
m_Def.m_bOneChoiceForAllPlayers = false;
const int NumCols = StringToInt( lCmds.v[0].m_vsArgs[0] );
@@ -195,10 +198,20 @@ public:
}
else
{
RageException::Throw( "Unkown row flag \"%s\".", sName.c_str() );
LuaHelpers::ReportScriptErrorFmt( "Unkown row flag \"%s\".", sName.c_str() );
}
}
if(NumCols < 1)
{
LuaHelpers::ReportScriptErrorFmt(sParam + " has %d choices.", NumCols);
GameCommand mc;
mc.ApplyCommitsScreens( false );
mc.Load( 0, ParseCommands("name,Error") );
m_aListEntries.push_back(mc);
RString sChoice = mc.m_sName;
m_Def.m_vsChoices.push_back( sChoice );
}
for( int col = 0; col < NumCols; ++col )
{
GameCommand mc;
@@ -209,17 +222,19 @@ public:
if( mc.m_sName == "" && NumCols == 1 )
mc.m_sName = sParam;
if( mc.m_sName == "" )
RageException::Throw( "List \"%s\", col %i has no name.", sParam.c_str(), col );
{
LuaHelpers::ReportScriptErrorFmt("List \"%s\", col %i has no name.", sParam.c_str(), col);
mc.m_sName= "";
}
if( !mc.IsPlayable() )
{
LOG->Trace( "\"%s\" is not playable.", sParam.c_str() );
LuaHelpers::ReportScriptErrorFmt("\"%s\" is not playable.", sParam.c_str());
continue;
}
m_aListEntries.push_back( mc );
RString sName = mc.m_sName;
RString sChoice = mc.m_sName;
m_Def.m_vsChoices.push_back( sChoice );
}
@@ -543,7 +558,7 @@ public:
}
else
{
RageException::Throw( "Invalid StepsType param \"%s\".", sParam.c_str() );
LuaHelpers::ReportScriptErrorFmt("Invalid StepsType param \"%s\".", sParam.c_str());
}
m_Def.m_sName = sParam;