From 76b25ffe7b3634a9c45f6625db507dbca313c700 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 21 Jun 2005 17:56:08 +0000 Subject: [PATCH] fix converting ^ to , wipes out ^ in background file names (Vertex^2) --- stepmania/src/NotesLoaderSM.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp index b4b899b8fd..3eac033a35 100644 --- a/stepmania/src/NotesLoaderSM.cpp +++ b/stepmania/src/NotesLoaderSM.cpp @@ -157,11 +157,8 @@ void SMLoader::LoadTimingFromSMFile( const MsdFile &msd, TimingData &out ) } } -bool LoadFromBGChangesString( BackgroundChange &change, const CString &_sBGChangeExpression ) +bool LoadFromBGChangesString( BackgroundChange &change, const CString &sBGChangeExpression ) { - CString sBGChangeExpression = _sBGChangeExpression; - sBGChangeExpression.Replace( '^', ',' ); // UGLY: unescape "," in colors - CStringArray aBGChangeValues; split( sBGChangeExpression, "=", aBGChangeValues, false ); @@ -171,9 +168,11 @@ bool LoadFromBGChangesString( BackgroundChange &change, const CString &_sBGChang { case 11: change.m_def.m_sColor2 = aBGChangeValues[10]; + change.m_def.m_sColor2.Replace( '^', ',' ); // UGLY: unescape "," in colors // fall through case 10: change.m_def.m_sColor1 = aBGChangeValues[9]; + change.m_def.m_sColor1.Replace( '^', ',' ); // UGLY: unescape "," in colors // fall through case 9: change.m_sTransition = aBGChangeValues[8];