fix missing metrics

This commit is contained in:
Glenn Maynard
2004-04-26 04:54:33 +00:00
parent 5463520a12
commit 97aaf75dd9
2 changed files with 9 additions and 3 deletions
+4 -2
View File
@@ -77,8 +77,10 @@ void ActiveAttackList::Update( float fDelta )
for( unsigned i=0; i<asTokens.size(); i++ )
asTokens[i] = Capitalize( asTokens[i] );
// Theme the mod name (the last string)
asTokens.back() = THEME->GetMetric( "OptionNames", asTokens.back() );
/* Theme the mod name (the last string). Allow this to not exist, since
* characters might use modifiers that don't exist in the theme. */
if( THEME->HasMetric( "OptionNames", asTokens.back() ) )
asTokens.back() = THEME->GetMetric( "OptionNames", asTokens.back() );
sMod = join( " ", asTokens );
+5 -1
View File
@@ -2459,7 +2459,11 @@ CString GameManager::NotesTypeToString( StepsType nt )
CString GameManager::NotesTypeToThemedString( StepsType nt )
{
return THEME->GetMetric( "StepsType", NotesTypeToString(nt) );
CString s = NotesTypeToString(nt);
if( THEME->HasMetric( "StepsType", s ) )
return THEME->GetMetric( "StepsType", s );
else
return s;
}
Game GameManager::StringToGameType( CString sGameType )