From 01f85359e98e4ac21538caf3f761b90d28657672 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Sun, 8 Jan 2012 18:59:51 +0700 Subject: [PATCH] BMSLoader: fall back to 7k IIDX stepstype when a non-familiar number of columns are found. --- src/NotesLoaderBMS.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/NotesLoaderBMS.cpp b/src/NotesLoaderBMS.cpp index 9c2e5d15da..2b14c1a2be 100644 --- a/src/NotesLoaderBMS.cpp +++ b/src/NotesLoaderBMS.cpp @@ -520,7 +520,7 @@ StepsType BMSChartReader::DetermineStepsType() case 7: case 8: return StepsType_beat_single7; case 9: return StepsType_popn_nine; - default: return StepsType_Invalid; + default: return StepsType_beat_single7; } case 2: // couple/battle return StepsType_dance_couple; @@ -532,7 +532,7 @@ StepsType BMSChartReader::DetermineStepsType() case 16: return StepsType_beat_double7; case 5: return StepsType_popn_five; case 9: return StepsType_popn_nine; - default: return StepsType_Invalid; + default: return StepsType_beat_double7; } default: LOG->UserLog( "Song file", in->path, "has an invalid #PLAYER value %d.", player ); @@ -912,8 +912,13 @@ bool BMSSongLoader::Load( RString fileName ) void BMSSongLoader::AddToSong() { + if( loadedSteps.size() == 0 ) + { + return; + } + RString commonSubstring = ""; - + { bool found = false; for( unsigned i = 0; i < loadedSteps.size(); i ++ )