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

Changed PainDisplay to print errors when MetricsGroup or PlayerNumber are not supplied instead of asserting.

Browse Source
This commit is contained in:
Kyzentun
2015-02-26 21:31:20 -07:00
parent c4fed9747c
commit 66d8490781
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PaneDisplay.cpp
+15 -3
View File
@@ -99,13 +99,25 @@ void PaneDisplay::LoadFromNode( const XNode *pNode )
RString sMetricsGroup; RString sMetricsGroup;
b = pNode->GetAttrValue( "MetricsGroup", sMetricsGroup ); b = pNode->GetAttrValue( "MetricsGroup", sMetricsGroup );
ASSERT( b ); if(!b)
{
sMetricsGroup= "PaneDisplay";
LuaHelpers::ReportScriptError("PaneDisplay must have a MetricsGroup specified.");
}
Lua *L = LUA->Get(); Lua *L = LUA->Get();
b = pNode->PushAttrValue( L, "PlayerNumber" ); b = pNode->PushAttrValue( L, "PlayerNumber" );
ASSERT( b );
PlayerNumber pn; PlayerNumber pn;
LuaHelpers::Pop( L, pn ); if(!b)
{
lua_pop(L, 1);
pn= GAMESTATE->GetMasterPlayerNumber();
LuaHelpers::ReportScriptError("PaneDisplay must have a PlayerNumber specified.");
}
else
{
LuaHelpers::Pop( L, pn );
}
LUA->Release( L ); LUA->Release( L );
Load( sMetricsGroup, pn ); Load( sMetricsGroup, pn );