this time, really allow themers to use either .ssc or .sm simfiles for ScreenGameplaySyncMachine.
This commit is contained in:
@@ -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
|
||||
--------
|
||||
* 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] Add format string metrics for the right hand side of the editor.
|
||||
[Wolfman2000]
|
||||
* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ]
|
||||
|
||||
20110221
|
||||
--------
|
||||
|
||||
@@ -21,15 +21,16 @@ void ScreenGameplaySyncMachine::Init()
|
||||
|
||||
RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music");
|
||||
// Allow themers to use .ssc and .sm files. -aj
|
||||
bool bLoadedSSCFile = SSCLoader::LoadFromSSCFile( sFile, m_Song );
|
||||
if( !bLoadedSSCFile )
|
||||
if(sFile.Right(4) == ".ssc")
|
||||
SSCLoader::LoadFromSSCFile( sFile, m_Song );
|
||||
else
|
||||
SMLoader::LoadFromSMFile( sFile, m_Song );
|
||||
|
||||
m_Song.SetSongDir( Dirname(sFile) );
|
||||
m_Song.TidyUpData();
|
||||
|
||||
GAMESTATE->m_pCurSong.Set( &m_Song );
|
||||
// needs proper StepsType - freem
|
||||
// Needs proper StepsType -freem
|
||||
vector<Steps*> vpSteps;
|
||||
SongUtil::GetPlayableSteps( &m_Song, vpSteps );
|
||||
ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine");
|
||||
|
||||
Reference in New Issue
Block a user