From f1af56a2614587eea7d54786826a13e9c6e5fad7 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 19 Dec 2005 12:52:59 +0000
Subject: [PATCH] fix mappings screwed up after mapping comma key and
 restarting fix VC6 compile

---
 stepmania/src/InputMapper.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 2e033610e1..a5d643b95d 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -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() )