From 4c15ede668d9f32dbaa34bb1949ad8971cf3a8a1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 25 Jan 2006 19:16:19 +0000 Subject: [PATCH] fix secondary button text --- stepmania/src/ScreenMapControllers.cpp | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 5b298bc47f..b86cbc01eb 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -60,23 +60,27 @@ void ScreenMapControllers::Init() { KeyToMap *pKey = &m_KeysToMap[b]; - BitmapText *pName = new BitmapText; - pName->SetName( "Title" ); - pName->LoadFromFont( THEME->GetPathF("Common","title") ); - RString sText = GameButtonToLocalizedString( GAMESTATE->GetCurrentGame(), pKey->m_GameButton ); - pName->SetText( sText ); - ActorUtil::LoadAllCommands( *pName, m_sName ); - m_Line[b].AddChild( pName ); - - BitmapText *pSecondary = new BitmapText; - pSecondary->SetName( "Secondary" ); - pSecondary->LoadFromFont( THEME->GetPathF("Common","title") ); - MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton ); - if( mb != MenuButton_INVALID ) - sText = MenuButtonToLocalizedString( mb ); - ActorUtil::LoadAllCommands( *pSecondary, m_sName ); - pSecondary->SetText( sText ); - m_Line[b].AddChild( pSecondary ); + { + BitmapText *pName = new BitmapText; + pName->SetName( "Title" ); + pName->LoadFromFont( THEME->GetPathF("Common","title") ); + RString sText = GameButtonToLocalizedString( GAMESTATE->GetCurrentGame(), pKey->m_GameButton ); + pName->SetText( sText ); + ActorUtil::LoadAllCommands( *pName, m_sName ); + m_Line[b].AddChild( pName ); + } + { + BitmapText *pSecondary = new BitmapText; + pSecondary->SetName( "Secondary" ); + pSecondary->LoadFromFont( THEME->GetPathF("Common","title") ); + MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton ); + RString sText; + if( mb != MenuButton_INVALID ) + sText = MenuButtonToLocalizedString( mb ); + ActorUtil::LoadAllCommands( *pSecondary, m_sName ); + pSecondary->SetText( sText ); + m_Line[b].AddChild( pSecondary ); + } for( int p=0; p