From 97aaf75dd964f645163e1b91b7d3199ea261f900 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 26 Apr 2004 04:54:33 +0000 Subject: [PATCH] fix missing metrics --- stepmania/src/ActiveAttackList.cpp | 6 ++++-- stepmania/src/GameManager.cpp | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ActiveAttackList.cpp b/stepmania/src/ActiveAttackList.cpp index 03330148b2..5aadaa6b0a 100644 --- a/stepmania/src/ActiveAttackList.cpp +++ b/stepmania/src/ActiveAttackList.cpp @@ -77,8 +77,10 @@ void ActiveAttackList::Update( float fDelta ) for( unsigned i=0; iGetMetric( "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 ); diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index f2e0ad936f..b161425c86 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -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 )