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

The correct syntax for theme metrics is "class::name".

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-17 05:37:42 +00:00
parent 941dac27b3
commit b1ccf2e5ff
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteSkinManager.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ RString NoteSkinManager::GetMetric( const RString &sButtonName, const RString &s
if( data.metrics.GetValue( sButtonName, sValue, sReturn ) )
return sReturn;
if( !data.metrics.GetValue( "NoteDisplay", sValue, sReturn ) )
RageException::Throw( "Could not read metric \"%s : %s\" or \"NoteDisplay : %s\" in \"%s\".",
RageException::Throw( "Could not read metric \"%s::%s\" or \"NoteDisplay::%s\" in \"%s\".",
sButtonName.c_str(), sValue.c_str(), sValue.c_str(), sNoteSkinName.c_str() );
return sReturn;
}
stepmania/src/OptionRowHandler.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ public:
/* Parse the basic configuration metric. */
Commands cmds = ParseCommands( ENTRY(sParam) );
if( cmds.v.size() < 1 )
RageException::Throw( "Parse error in ScreenOptionsMaster::%s.", sParam.c_str() );
RageException::Throw( "Parse error in \"ScreenOptionsMaster::%s\".", sParam.c_str() );
m_Def.m_bOneChoiceForAllPlayers = false;
const int NumCols = atoi( cmds.v[0].m_vsArgs[0] );
stepmania/src/ScreenOptionsMaster.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ void ScreenOptionsMaster::Init()
vector<RString> asLineNames;
split( LINE_NAMES, ",", asLineNames );
if( asLineNames.empty() )
RageException::Throw( "\"%s : LineNames\" is empty.", m_sName.c_str() );
RageException::Throw( "\"%s::LineNames\" is empty.", m_sName.c_str() );
if( FORCE_ALL_PLAYERS )
{
@@ -59,7 +59,7 @@ void ScreenOptionsMaster::Init()
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds );
if( pHand == NULL )
RageException::Throw( "Invalid OptionRowHandler \"%s\" in \"%s : Line%i\".", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i );
RageException::Throw( "Invalid OptionRowHandler \"%s\" in \"%s::Line%i\".", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i );
OptionRowHandlers.push_back( pHand );
}
stepmania/src/ThemeManager.cpp
+4 -4
View File
@@ -827,7 +827,7 @@ bool ThemeManager::GetMetricRawRecursive( const IniFile &ini, const RString &sCl
sClassName = sFallback;
}
RageException::Throw( "Infinite recursion looking up theme metric \"%s : %s\".", sClassName.c_str(), sValueName.c_str() );
RageException::Throw( "Infinite recursion looking up theme metric \"%s::%s\".", sClassName.c_str(), sValueName.c_str() );
}
RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassName_, const RString &sValueName_ )
@@ -845,12 +845,12 @@ RString ThemeManager::GetMetricRaw( const IniFile &ini, const RString &sClassNam
RString sCurMetricPath = GetMetricsIniPath( m_sCurThemeName );
RString sDefaultMetricPath = GetMetricsIniPath( SpecialFiles::BASE_THEME_NAME );
RString sMessage = ssprintf( "The theme metric \"%s : %s\" is missing. Correct this and click Retry, or Cancel to break.",
RString sMessage = ssprintf( "The theme metric \"%s::%s\" is missing. Correct this and click Retry, or Cancel to break.",
sClassName.c_str(), sValueName.c_str() );
switch( Dialog::AbortRetryIgnore(sMessage) )
{
case Dialog::abort:
RageException::Throw( "Theme metric \"%s : %s\" could not be found in \"%s\"' or \"%s\".",
RageException::Throw( "Theme metric \"%s::%s\" could not be found in \"%s\"' or \"%s\".",
sClassName.c_str(), sValueName.c_str(), sCurMetricPath.c_str(),
sDefaultMetricPath.c_str() );
case Dialog::retry:
@@ -931,7 +931,7 @@ RageColor ThemeManager::GetMetricC( const RString &sClassName, const RString &sV
RageColor ret(1,1,1,1);
if( !ret.FromString(sValue) )
LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + " : " + sValueName,
LOG->UserLog( RageLog::LogType_ThemeMetric, sClassName + "::" + sValueName,
"has an invalid color value \"%s\".", sValue.c_str() );
return ret;
}