fix secondary button text
This commit is contained in:
@@ -60,6 +60,7 @@ void ScreenMapControllers::Init()
|
|||||||
{
|
{
|
||||||
KeyToMap *pKey = &m_KeysToMap[b];
|
KeyToMap *pKey = &m_KeysToMap[b];
|
||||||
|
|
||||||
|
{
|
||||||
BitmapText *pName = new BitmapText;
|
BitmapText *pName = new BitmapText;
|
||||||
pName->SetName( "Title" );
|
pName->SetName( "Title" );
|
||||||
pName->LoadFromFont( THEME->GetPathF("Common","title") );
|
pName->LoadFromFont( THEME->GetPathF("Common","title") );
|
||||||
@@ -67,16 +68,19 @@ void ScreenMapControllers::Init()
|
|||||||
pName->SetText( sText );
|
pName->SetText( sText );
|
||||||
ActorUtil::LoadAllCommands( *pName, m_sName );
|
ActorUtil::LoadAllCommands( *pName, m_sName );
|
||||||
m_Line[b].AddChild( pName );
|
m_Line[b].AddChild( pName );
|
||||||
|
}
|
||||||
|
{
|
||||||
BitmapText *pSecondary = new BitmapText;
|
BitmapText *pSecondary = new BitmapText;
|
||||||
pSecondary->SetName( "Secondary" );
|
pSecondary->SetName( "Secondary" );
|
||||||
pSecondary->LoadFromFont( THEME->GetPathF("Common","title") );
|
pSecondary->LoadFromFont( THEME->GetPathF("Common","title") );
|
||||||
MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton );
|
MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton );
|
||||||
|
RString sText;
|
||||||
if( mb != MenuButton_INVALID )
|
if( mb != MenuButton_INVALID )
|
||||||
sText = MenuButtonToLocalizedString( mb );
|
sText = MenuButtonToLocalizedString( mb );
|
||||||
ActorUtil::LoadAllCommands( *pSecondary, m_sName );
|
ActorUtil::LoadAllCommands( *pSecondary, m_sName );
|
||||||
pSecondary->SetText( sText );
|
pSecondary->SetText( sText );
|
||||||
m_Line[b].AddChild( pSecondary );
|
m_Line[b].AddChild( pSecondary );
|
||||||
|
}
|
||||||
|
|
||||||
for( int p=0; p<MAX_GAME_CONTROLLERS; p++ )
|
for( int p=0; p<MAX_GAME_CONTROLLERS; p++ )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user