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

Fix .sm-style edits not being loaded.

Browse Source
This commit is contained in:
AJ Kelly
2011-02-21 03:38:44 -06:00
parent d7caea9f0a
commit f6a0e25d86
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+1
View File
@@ -18,6 +18,7 @@ sm-ssc v1.2.3 | 201102??
* Reverted ArrowSpacing back to 64 (which was the previous value). * Reverted ArrowSpacing back to 64 (which was the previous value).
Please re-adjust your speed mods accordingly. [AJ] Please re-adjust your speed mods accordingly. [AJ]
* [OptionRow] Added GetLayoutType() and GetSelectType() Lua bindings. [AJ] * [OptionRow] Added GetLayoutType() and GetSelectType() Lua bindings. [AJ]
* Fix .sm-style edits not being loaded. [AJ]
================================================================================ ================================================================================
sm-ssc v1.2.2 | 20110220 sm-ssc v1.2.2 | 20110220
src/NotesLoaderSSC.cpp
+4 -1
View File
@@ -984,6 +984,7 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
return false; return false;
} }
} }
else if( sValueName=="NOTEDATA" ) else if( sValueName=="NOTEDATA" )
{ {
pNewNotes = new Steps; pNewNotes = new Steps;
@@ -1117,7 +1118,9 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
} }
} }
return true; //return true;
// only load a SSC edit if it passes the checks. -aj
return bSSCFormat;
} }
void SSCLoader::TidyUpData( Song &song, bool bFromCache ) void SSCLoader::TidyUpData( Song &song, bool bFromCache )
src/SongManager.cpp
+9 -7
View File
@@ -16,6 +16,7 @@
#include "NoteSkinManager.h" #include "NoteSkinManager.h"
#include "NotesLoaderDWI.h" #include "NotesLoaderDWI.h"
#include "NotesLoaderSSC.h" #include "NotesLoaderSSC.h"
#include "NotesLoaderSM.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "Profile.h" #include "Profile.h"
#include "ProfileManager.h" #include "ProfileManager.h"
@@ -460,10 +461,8 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
} }
else else
{ {
/* XXX: Previously, this matched all notes, which set a song to "extra"
/* XXX: * if it had any 10-foot steps at all, even edits or doubles.
* Previously, this matched all notes, which set a song to "extra" if
* it had any 10-foot steps at all, even edits or doubles.
* *
* For now, only look at notes for the current note type. This means * For now, only look at notes for the current note type. This means
* that if a song has 10-foot steps on Doubles, it'll only show up red * that if a song has 10-foot steps on Doubles, it'll only show up red
@@ -471,8 +470,7 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
* in the song scroll, which is a little odd but harmless. * in the song scroll, which is a little odd but harmless.
* *
* XXX: Ack. This means this function can only be called when we have * XXX: Ack. This means this function can only be called when we have
* a style set up, which is too restrictive. How to handle this? * a style set up, which is too restrictive. How to handle this? */
*/
//const StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; //const StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
const vector<Steps*>& vpSteps = pSong->GetAllSteps(); const vector<Steps*>& vpSteps = pSong->GetAllSteps();
for( unsigned i=0; i<vpSteps.size(); i++ ) for( unsigned i=0; i<vpSteps.size(); i++ )
@@ -1656,7 +1654,11 @@ void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, Profi
{ {
RString fn = vsFiles[i]; RString fn = vsFiles[i];
SSCLoader::LoadEditFromFile( fn, slot, true ); bool bLoadedFromSSC = SSCLoader::LoadEditFromFile( fn, slot, true );
// If we don't load the edit from a .ssc-style .edit, then we should
// also try the .sm-style edit file. -aj
if( !bLoadedFromSSC )
SMLoader::LoadEditFromFile( fn, slot, true );
} }
} }
} }