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

this time, really allow themers to use either .ssc or .sm simfiles for ScreenGameplaySyncMachine.

Browse Source
This commit is contained in:
AJ Kelly
2011-03-02 01:29:58 -06:00
parent bbfeedab5a
commit 182bb0590c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+5 -2
View File
@@ -10,9 +10,13 @@ supported but exist anyways.)
_____________________________________________________________________________ _____________________________________________________________________________
================================================================================ ================================================================================
sm-ssc v1.2.3 | 2011022? sm-ssc v1.2.3 | 201103??
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
20110302
--------
* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ]
20110301 20110301
-------- --------
* Allow Tickcount Segments to have a value of 0 to better replicate some * Allow Tickcount Segments to have a value of 0 to better replicate some
@@ -61,7 +65,6 @@ sm-ssc v1.2.3 | 2011022?
* [ScreenEdit] Display the Player Number for Routine mode. [Wolfman2000] * [ScreenEdit] Display the Player Number for Routine mode. [Wolfman2000]
* [ScreenEdit] Add format string metrics for the right hand side of the editor. * [ScreenEdit] Add format string metrics for the right hand side of the editor.
[Wolfman2000] [Wolfman2000]
* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ]
20110221 20110221
-------- --------
src/ScreenGameplaySyncMachine.cpp
+4 -3
View File
@@ -21,15 +21,16 @@ void ScreenGameplaySyncMachine::Init()
RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music"); RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music");
// Allow themers to use .ssc and .sm files. -aj // Allow themers to use .ssc and .sm files. -aj
bool bLoadedSSCFile = SSCLoader::LoadFromSSCFile( sFile, m_Song ); if(sFile.Right(4) == ".ssc")
if( !bLoadedSSCFile ) SSCLoader::LoadFromSSCFile( sFile, m_Song );
else
SMLoader::LoadFromSMFile( sFile, m_Song ); SMLoader::LoadFromSMFile( sFile, m_Song );
m_Song.SetSongDir( Dirname(sFile) ); m_Song.SetSongDir( Dirname(sFile) );
m_Song.TidyUpData(); m_Song.TidyUpData();
GAMESTATE->m_pCurSong.Set( &m_Song ); GAMESTATE->m_pCurSong.Set( &m_Song );
// needs proper StepsType - freem // Needs proper StepsType -freem
vector<Steps*> vpSteps; vector<Steps*> vpSteps;
SongUtil::GetPlayableSteps( &m_Song, vpSteps ); SongUtil::GetPlayableSteps( &m_Song, vpSteps );
ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine"); ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine");