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

[notesloader] More virtuals.

Browse Source
This commit is contained in:
Jason Felds
2011-06-09 21:27:47 -04:00
parent 68fd21fdc8
commit 1e296ed0bf
11 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameSoundManager.cpp
+2 -2
View File
@@ -145,7 +145,7 @@ static void StartMusic( MusicToPlay &ToPlay )
SSCLoader loaderSSC;
SMLoader loaderSM;
if(GetExtension(ToPlay.m_sTimingFile) == ".ssc" &&
loaderSSC.LoadFromSSCFile(ToPlay.m_sTimingFile, song) )
loaderSSC.LoadFromSimfile(ToPlay.m_sTimingFile, song) )
{
ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_SongTiming;
@@ -155,7 +155,7 @@ static void StartMusic( MusicToPlay &ToPlay )
pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData );
}
else if(GetExtension(ToPlay.m_sTimingFile) == ".sm" &&
loaderSM.LoadFromSMFile(ToPlay.m_sTimingFile, song) )
loaderSM.LoadFromSimfile(ToPlay.m_sTimingFile, song) )
{
ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_SongTiming;
src/NotesLoaderSM.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ bool SMLoader::LoadFromDir( const RString &sPath, Song &out )
ASSERT( aFileNames.size() == 1 );
//ASSERT( aFileNames.size() >= 1 );
return LoadFromSMFile( sPath + aFileNames[0], out );
return LoadFromSimfile( sPath + aFileNames[0], out );
}
float SMLoader::RowToBeat( RString line, const int rowsPerBeat )
@@ -598,7 +598,7 @@ bool SMLoader::LoadFromBGChangesString( BackgroundChange &change, const RString
return aBGChangeValues.size() >= 2;
}
bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache )
bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache )
{
LOG->Trace( "Song::LoadFromSMFile(%s)", sPath.c_str() );
src/NotesLoaderSM.h
+8 -1
View File
@@ -28,7 +28,14 @@ struct SMLoader
*/
virtual void TidyUpData( Song &song, bool bFromCache );
bool LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache = false );
/**
* @brief Attempt to load the specified sm file.
* @param sPath a const reference to the path on the hard drive to check.
* @param out a reference to the Song that will retrieve the song information.
* @param bFromCache a check to see if we are getting certain information from the cache file.
* @return its success or failure.
*/
virtual bool LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache = false );
/**
* @brief Retrieve the list of .sm files.
* @param sPath a const reference to the path on the hard drive to check.
src/NotesLoaderSMA.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ bool SMALoader::LoadFromDir( const RString &sPath, Song &out )
return false;
}
ASSERT( aFileNames.size() == 1 );
return LoadFromSMAFile( sPath + aFileNames[0], out );
return LoadFromSimfile( sPath + aFileNames[0], out );
}
void SMALoader::ProcessMultipliers( TimingData &out, const int iRowsPerBeat, const RString sParam )
@@ -142,7 +142,7 @@ void SMALoader::ProcessSpeeds( TimingData &out, const RString line, const int ro
}
}
bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out )
bool SMALoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache )
{
LOG->Trace( "Song::LoadFromSMAFile(%s)", sPath.c_str() );
src/NotesLoaderSMA.h
+1 -1
View File
@@ -25,7 +25,7 @@ struct SMALoader : public SMLoader
{
bool LoadFromDir( const RString &sPath, Song &out );
bool LoadFromSMAFile( const RString &sPath, Song &out );
virtual bool LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache = false );
/**
* @brief Retrieve the list of .sma files.
* @param sPath a const reference to the path on the hard drive to check.
src/NotesLoaderSSC.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ bool SSCLoader::LoadFromDir( const RString &sPath, Song &out )
}
ASSERT( aFileNames.size() == 1 );
return LoadFromSSCFile( sPath + aFileNames[0], out );
return LoadFromSimfile( sPath + aFileNames[0], out );
}
void SSCLoader::ProcessWarps( TimingData &out, const RString sParam, const float fVersion )
@@ -149,7 +149,7 @@ void SSCLoader::ProcessScrolls( TimingData &out, const RString sParam )
}
bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCache )
bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache )
{
LOG->Trace( "Song::LoadFromSSCFile(%s)", sPath.c_str() );
src/NotesLoaderSSC.h
+1 -1
View File
@@ -46,7 +46,7 @@ struct SSCLoader : public SMLoader
* @param bFromCache a check to see if we are getting certain information from the cache file.
* @return its success or failure.
*/
bool LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCache = false );
virtual bool LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache = false );
/**
* @brief Retrieve the list of .ssc files.
* @param sPath a const reference to the path on the hard drive to check.
src/ScreenGameplaySyncMachine.cpp
+2 -2
View File
@@ -24,9 +24,9 @@ void ScreenGameplaySyncMachine::Init()
SSCLoader loaderSSC;
SMLoader loaderSM;
if(sFile.Right(4) == ".ssc")
loaderSSC.LoadFromSSCFile( sFile, m_Song );
loaderSSC.LoadFromSimfile( sFile, m_Song );
else
loaderSM.LoadFromSMFile( sFile, m_Song );
loaderSM.LoadFromSimfile( sFile, m_Song );
m_Song.SetSongDir( Dirname(sFile) );
m_Song.TidyUpData();
src/ScreenHowToPlay.cpp
+2 -2
View File
@@ -138,9 +138,9 @@ void ScreenHowToPlay::Init()
SSCLoader loaderSSC;
SMLoader loaderSM;
if( sStepsPath.Right(4) == ".ssc" )
loaderSSC.LoadFromSSCFile( sStepsPath, m_Song, false );
loaderSSC.LoadFromSimfile( sStepsPath, m_Song, false );
else
loaderSM.LoadFromSMFile( sStepsPath, m_Song, false );
loaderSM.LoadFromSimfile( sStepsPath, m_Song, false );
m_Song.AddAutoGenNotes();
const Style* pStyle = GAMESTATE->GetCurrentStyle();
src/Song.cpp
+2 -2
View File
@@ -236,12 +236,12 @@ bool Song::LoadFromSongDir( RString sDir )
{
// LOG->Trace( "Loading '%s' from cache file '%s'.", m_sSongDir.c_str(), GetCacheFilePath().c_str() );
SSCLoader loaderSSC;
bool bLoadedFromSSC = loaderSSC.LoadFromSSCFile( sCacheFilePath, *this, true );
bool bLoadedFromSSC = loaderSSC.LoadFromSimfile( sCacheFilePath, *this, true );
if( !bLoadedFromSSC )
{
// load from .sm
SMLoader loaderSM;
loaderSM.LoadFromSMFile( sCacheFilePath, *this, true );
loaderSM.LoadFromSimfile( sCacheFilePath, *this, true );
loaderSM.TidyUpData( *this, true );
}
}
src/Steps.cpp
+2 -2
View File
@@ -243,12 +243,12 @@ void Steps::Decompress() const
// We have data on disk and not in memory. Load it.
Song s;
SSCLoader loaderSSC;
bool bLoadedFromSSC = loaderSSC.LoadFromSSCFile(m_sFilename, s, true);
bool bLoadedFromSSC = loaderSSC.LoadFromSimfile(m_sFilename, s, true);
if( !bLoadedFromSSC )
{
// try reading from .sm instead
SMLoader loaderSM;
if( !loaderSM.LoadFromSMFile(m_sFilename, s, true) )
if( !loaderSM.LoadFromSimfile(m_sFilename, s, true) )
{
LOG->Warn( "Couldn't load \"%s\"", m_sFilename.c_str() );
return;