change InputScheme for easier maintenance of game definitions

This commit is contained in:
Chris Danford
2006-10-23 06:47:54 +00:00
parent 9d19fd5008
commit 5216992b26
4 changed files with 178 additions and 544 deletions
+2 -2
View File
@@ -57,7 +57,7 @@ void InputMapper::AddDefaultMappingsForCurrentGameIfUnmapped()
{
for( int b=0; b<m_pInputScheme->m_iButtonsPerController; b++ )
{
DeviceButton key = m_pInputScheme->m_iDefaultKeyboardKey[c][b];
DeviceButton key = m_pInputScheme->m_GameButtonInfo[b].m_iDefaultKeyboardKey[c];
if( key == NO_DEFAULT_KEY )
continue;
DeviceInput DeviceI( DEVICE_KEYBOARD, key );
@@ -918,7 +918,7 @@ MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const
{
for( int i=0; i<m_iButtonsPerController; i++ )
if( stricmp(m_szButtonNames[i], sButtonName) == 0 )
if( stricmp(m_GameButtonInfo[i].m_szName, sButtonName) == 0 )
return i;
return GameButton_Invalid;