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

use SMLoader::LoadTimingFromSMFile

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-18 04:51:39 +00:00
parent 4f00a0715e
commit 4365b2b496
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSounds.cpp
+1 -9
View File
@@ -6,7 +6,6 @@
#include "RageUtil.h" #include "RageUtil.h"
#include "GameState.h" #include "GameState.h"
#include "TimingData.h" #include "TimingData.h"
#include "MsdFile.h"
#include "NotesLoaderSM.h" #include "NotesLoaderSM.h"
RageSounds *SOUND = NULL; RageSounds *SOUND = NULL;
@@ -156,15 +155,8 @@ void StartMusic( MusicToPlay &ToPlay )
if( IsAFile(ToPlay.timing_file) ) if( IsAFile(ToPlay.timing_file) )
{ {
LOG->Trace("Found '%s'", ToPlay.timing_file.c_str()); LOG->Trace("Found '%s'", ToPlay.timing_file.c_str());
MsdFile msd; if( SMLoader::LoadTimingFromFile( ToPlay.timing_file, NewMusic->m_NewTiming ) )
bool bResult = msd.ReadFile( ToPlay.timing_file );
if( !bResult )
LOG->Warn( "Couldn't load %s, \"%s\"", ToPlay.timing_file.c_str(), msd.GetError().c_str() );
else
{
SMLoader::LoadTimingFromSMFile( msd, NewMusic->m_NewTiming );
ToPlay.HasTiming = true; ToPlay.HasTiming = true;
}
} }
if( ToPlay.HasTiming && ToPlay.force_loop && ToPlay.length_sec != -1 ) if( ToPlay.HasTiming && ToPlay.force_loop && ToPlay.length_sec != -1 )