actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix mappings screwed up after mapping comma key and restarting

Browse Source 
fix VC6 compile
This commit is contained in:
Chris Danford
2005-12-19 12:52:59 +00:00
parent d29b85efe5
commit f1af56a261
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputMapper.cpp
+5 -4
View File
@@ -439,6 +439,8 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
}
}
static const CString DEVICE_INPUT_SEPARATOR = ":"; // this isn't used in any key names
void InputMapper::ReadMappingsFromDisk()
{
ASSERT( GAMEMAN != NULL );
@@ -465,7 +467,7 @@ void InputMapper::ReadMappingsFromDisk()
GameI.fromString( pGame, name );
vector<CString> sDeviceInputStrings;
split( value, ",", sDeviceInputStrings, false );
split( value, DEVICE_INPUT_SEPARATOR, sDeviceInputStrings, false );
for( unsigned i=0; i<sDeviceInputStrings.size() && i<unsigned(NUM_GAME_TO_DEVICE_SLOTS); i++ )
{
@@ -480,7 +482,6 @@ void InputMapper::ReadMappingsFromDisk()
AddDefaultMappingsForCurrentGameIfUnmapped();
}
void InputMapper::SaveMappingsToDisk()
{
IniFile ini;
@@ -506,7 +507,7 @@ void InputMapper::SaveMappingsToDisk()
while( asValues.size() && asValues.back() == "" )
asValues.erase( asValues.begin()+asValues.size()-1 );
CString sValueString = join( ",", asValues );
CString sValueString = join( DEVICE_INPUT_SEPARATOR, asValues );
ini.SetValue( pGame->m_szName, sNameString, sValueString );
}
@@ -534,7 +535,7 @@ bool InputMapper::CheckForChangedInputDevicesAndRemap( CString &sMessage )
vector<CString> vsConnects, vsDisconnects;
GetConnectsDisconnects( vsLastSeen, vsDescriptions, vsDisconnects, vsConnects );
sMessage.clear();
sMessage = CString();
if( !vsConnects.empty() )
sMessage += "Connected: " + join( "\n", vsConnects ) + "\n";
if( !vsDisconnects.empty() )