From b556103f386f758533e5e9c78039c381cf5445f0 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 29 May 2011 21:34:40 -0400 Subject: [PATCH 1/5] Again, don't worry about warnings for externs. Missed one involving lua. --- Xcode/stepmania.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 180f658b6c..8edf41e019 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -8004,6 +8004,7 @@ LUA_USE_MACOSX, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -8358,6 +8359,7 @@ LUA_USE_MACOSX, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -8382,6 +8384,7 @@ LUA_USE_MACOSX, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -8406,6 +8409,7 @@ LUA_USE_MACOSX, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = NO; From 09c56854b59b207a750e0045138600c355e03632 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 29 May 2011 22:44:01 -0400 Subject: [PATCH 2/5] In SMA land, 2 params mean instant always. --- src/NotesLoaderSMA.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index fc67e3b598..18c481a3ef 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -321,7 +321,7 @@ void SMALoader::ProcessSpeeds( TimingData &out, const int iRowsPerBeat, const RS vector vs2; split( *s1, "=", vs2 ); - if( RowToBeat(vs2[0], iRowsPerBeat) == 0 && vs2.size() == 2 ) // First one always seems to have 2. + if( vs2.size() == 2 ) // First one always seems to have 2. { vs2.push_back("0"); } From 8de49622eb3e70ae876f7891741bfe2634bf570b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 29 May 2011 22:44:23 -0400 Subject: [PATCH 3/5] Ensure the reference is passed. --- src/NotesLoaderSMA.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 18c481a3ef..b23fca7be5 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -661,7 +661,9 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out ) else if( sValueName=="MULTIPLIER" ) { - ProcessMultipliers( pNewNotes->m_Timing, iRowsPerBeat, sParams[1] ); + TimingData &timing = (state == SMA_GETTING_STEP_INFO + ? pNewNotes->m_Timing : out.m_SongTiming); + ProcessMultipliers( timing, iRowsPerBeat, sParams[1] ); } else if( sValueName=="FAKES" ) From 149b004ecfd6f71353d052328f999a69e0fa61af Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 29 May 2011 23:55:03 -0400 Subject: [PATCH 4/5] Slightly overdid it, but speeds parse. --- src/NotesLoaderSMA.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index b23fca7be5..347399adfa 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -319,7 +319,10 @@ void SMALoader::ProcessSpeeds( TimingData &out, const int iRowsPerBeat, const RS FOREACH_CONST( RString, vs1, s1 ) { vector vs2; - split( *s1, "=", vs2 ); + vs2.clear(); // trying something. + RString loopTmp = *s1; + Trim( loopTmp ); + split( loopTmp, "=", vs2 ); if( vs2.size() == 2 ) // First one always seems to have 2. { @@ -656,7 +659,9 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out ) { TimingData &timing = (state == SMA_GETTING_STEP_INFO ? pNewNotes->m_Timing : out.m_SongTiming); - ProcessSpeeds( timing, iRowsPerBeat, sParams[1] ); + RString tmp = sParams[1]; + Trim( tmp ); + ProcessSpeeds( timing, iRowsPerBeat, tmp ); } else if( sValueName=="MULTIPLIER" ) From 9a64fb230b1a04799916fb79d1c16a3ddec1904d Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 30 May 2011 00:44:16 -0400 Subject: [PATCH 5/5] Don't clap skipped judged rows. ...yeah, we may need a function here. --- src/GameplayAssist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GameplayAssist.cpp b/src/GameplayAssist.cpp index af05a52ed4..4ecd6be014 100644 --- a/src/GameplayAssist.cpp +++ b/src/GameplayAssist.cpp @@ -47,7 +47,7 @@ void GameplayAssist::PlayTicks( const NoteData &nd, const PlayerState *ps ) if( nd.IsThereATapOrHoldHeadAtRow( r ) ) iClapRow = r; - if( iClapRow != -1 ) + if( iClapRow != -1 && !timing.IsWarpAtRow( iClapRow ) && !timing.IsFakeAtRow( iClapRow ) ) { const float fTickBeat = NoteRowToBeat( iClapRow ); const float fTickSecond = timing.GetElapsedTimeFromBeatNoOffset( fTickBeat );