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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-21 18:09:59 +00:00
parent 6eb5d623b9
commit eaf69775bb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameSoundManager.cpp
+4 -4
View File
@@ -86,7 +86,7 @@ struct MusicToPlay
NoteData lights_data; NoteData lights_data;
bool bForceLoop; bool bForceLoop;
float fStartSecond, fLengthSeconds, fFadeLengthSeconds; float fStartSecond, fLengthSeconds, fFadeLengthSeconds;
bool align_beat; bool bAlignBeat;
MusicToPlay() MusicToPlay()
{ {
HasTiming = false; HasTiming = false;
@@ -156,7 +156,7 @@ static void StartMusic( MusicToPlay &ToPlay )
NewMusic->m_Lights = ToPlay.lights_data; NewMusic->m_Lights = ToPlay.lights_data;
} }
if( ToPlay.align_beat && ToPlay.HasTiming && ToPlay.bForceLoop && ToPlay.fLengthSeconds != -1 ) if( ToPlay.bAlignBeat && ToPlay.HasTiming && ToPlay.bForceLoop && ToPlay.fLengthSeconds != -1 )
{ {
/* Extend the loop period so it always starts and ends on the same fractional /* Extend the loop period so it always starts and ends on the same fractional
* beat. That is, if it starts on beat 1.5, and ends on beat 10.2, extend it * beat. That is, if it starts on beat 1.5, and ends on beat 10.2, extend it
@@ -199,7 +199,7 @@ static void StartMusic( MusicToPlay &ToPlay )
* start now. */ * start now. */
if( !g_Playing->m_bHasTiming && !g_UpdatingTimer ) if( !g_Playing->m_bHasTiming && !g_UpdatingTimer )
StartImmediately = true; StartImmediately = true;
if( !ToPlay.align_beat ) if( !ToPlay.bAlignBeat )
StartImmediately = true; StartImmediately = true;
RageTimer when; /* zero */ RageTimer when; /* zero */
@@ -664,7 +664,7 @@ void GameSoundManager::PlayMusic(
ToPlay.fStartSecond = fStartSecond; ToPlay.fStartSecond = fStartSecond;
ToPlay.fLengthSeconds = fLengthSeconds; ToPlay.fLengthSeconds = fLengthSeconds;
ToPlay.fFadeLengthSeconds = sFadeLengthSeconds; ToPlay.fFadeLengthSeconds = sFadeLengthSeconds;
ToPlay.align_beat = bAlignBeat; ToPlay.bAlignBeat = bAlignBeat;
/* Add the MusicToPlay to the g_MusicsToPlay queue. */ /* Add the MusicToPlay to the g_MusicsToPlay queue. */
g_Mutex->Lock(); g_Mutex->Lock();