InputScheme

This commit is contained in:
Glenn Maynard
2006-09-30 08:24:05 +00:00
parent b6c3ea14d7
commit 3f315b0464
7 changed files with 26 additions and 28 deletions
+3 -3
View File
@@ -48,7 +48,7 @@ void ScreenMapControllers::Init()
if( sButtons.empty() )
{
/* Map all buttons for this game. */
for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ )
for( int b=0; b<INPUTMAPPER->GetInputScheme()->m_iButtonsPerController; b++ )
{
KeyToMap k;
k.m_GameButton = (GameButton) b;
@@ -63,7 +63,7 @@ void ScreenMapControllers::Init()
for( unsigned i=0; i<asBits.size(); ++i )
{
KeyToMap k;
k.m_GameButton = StringToGameButton( GAMESTATE->GetCurrentGame(), asBits[i] );
k.m_GameButton = StringToGameButton( INPUTMAPPER->GetInputScheme(), asBits[i] );
m_KeysToMap.push_back( k );
}
}
@@ -97,7 +97,7 @@ void ScreenMapControllers::Init()
BitmapText *pName = new BitmapText;
pName->SetName( "Primary" );
pName->LoadFromFont( THEME->GetPathF("Common","title") );
RString sText = GameButtonToLocalizedString( GAMESTATE->GetCurrentGame(), pKey->m_GameButton );
RString sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), pKey->m_GameButton );
pName->SetText( sText );
ActorUtil::LoadAllCommands( *pName, m_sName );
m_Line[iRow].AddChild( pName );