CString -> RString in RageUtil

ThemeMetric<CString> -> LocalizedString to eliminate dependencies
This commit is contained in:
Chris Danford
2005-12-20 08:35:47 +00:00
parent 0311b4256b
commit d698a5f1ec
35 changed files with 439 additions and 291 deletions
+4 -2
View File
@@ -59,6 +59,8 @@ ScreenTitleMenu::~ScreenTitleMenu()
CHARMAN->UndemandGraphics();
}
static LocalizedString THEME_ ("ScreenTitleMenu","Theme");
static LocalizedString ANNOUNCER_ ("ScreenTitleMenu","Announcer");
void ScreenTitleMenu::Input( const InputEventPlus &input )
{
LOG->Trace( "ScreenTitleMenu::Input( %d-%d )", input.DeviceI.device, input.DeviceI.button ); // debugging gameport joystick problem
@@ -76,7 +78,7 @@ void ScreenTitleMenu::Input( const InputEventPlus &input )
{
THEME->NextTheme();
StepMania::ApplyGraphicOptions(); // update window title and icon
SCREENMAN->SystemMessage( "Theme: "+THEME->GetCurThemeName() );
SCREENMAN->SystemMessage( THEME_.GetValue()+": "+THEME->GetCurThemeName() );
SCREENMAN->SetNewScreen( m_sName );
TEXTUREMAN->DoDelayedDelete();
}
@@ -86,7 +88,7 @@ void ScreenTitleMenu::Input( const InputEventPlus &input )
ANNOUNCER->NextAnnouncer();
CString sName = ANNOUNCER->GetCurAnnouncerName();
if( sName=="" ) sName = "(none)";
SCREENMAN->SystemMessage( "Announcer: "+sName );
SCREENMAN->SystemMessage( ANNOUNCER_.GetValue()+": "+sName );
SCREENMAN->SetNewScreen( m_sName );
}
}