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

fix BGChange crash

Browse Source
This commit is contained in:
Chris Danford
2004-01-24 19:05:54 +00:00
parent 6538cad180
commit 8ba5efc31b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Background.cpp
+12 -12
View File
@@ -116,7 +116,7 @@ void Background::Unload()
m_pFadingBGA = NULL; m_pFadingBGA = NULL;
m_pSong = NULL; m_pSong = NULL;
m_fSecsLeftInFade = 0; m_fSecsLeftInFade = 0;
m_iCurBGChangeIndex = 0; m_iCurBGChangeIndex = -1;
m_fLastMusicSeconds = -9999; m_fLastMusicSeconds = -9999;
} }
@@ -393,14 +393,14 @@ void Background::LoadFromSong( const Song* pSong )
LoadFromRandom( fStartBeat, fLastBeat, pSong->m_Timing ); LoadFromRandom( fStartBeat, fLastBeat, pSong->m_Timing );
} }
// At this point, we shouldn't have any BGChanges to "". "" is an invalid name.
for( i=0; i<m_aBGChanges.size(); i++ )
ASSERT( !m_aBGChanges[i].m_sBGName.empty() );
// Re-sort. // Re-sort.
SortBackgroundChangesArray( m_aBGChanges ); SortBackgroundChangesArray( m_aBGChanges );
// scale all rates by the current music rate
for( i=0; i<m_aBGChanges.size(); i++ )
m_aBGChanges[i].m_fRate *= GAMESTATE->m_SongOptions.m_fMusicRate;
for( map<CString,BGAnimation*>::iterator iter = m_BGAnimations.begin(); for( map<CString,BGAnimation*>::iterator iter = m_BGAnimations.begin();
iter != m_BGAnimations.end(); iter != m_BGAnimations.end();
iter++ ) iter++ )
@@ -431,7 +431,7 @@ void Background::LoadFromSong( const Song* pSong )
m_pDancingCharacters->LoadNextSong(); m_pDancingCharacters->LoadNextSong();
} }
int Background::FindBPMSegmentForBeat( float fBeat ) const int Background::FindBGSegmentForBeat( float fBeat ) const
{ {
int i; int i;
for( i=0; i<(int)(m_aBGChanges.size()) - 1; i++ ) for( i=0; i<(int)(m_aBGChanges.size()) - 1; i++ )
@@ -454,13 +454,13 @@ void Background::UpdateCurBGChange( float fCurrentTime )
bool bFreeze; bool bFreeze;
m_pSong->m_Timing.GetBeatAndBPSFromElapsedTime( fCurrentTime, fBeat, fBPS, bFreeze ); m_pSong->m_Timing.GetBeatAndBPSFromElapsedTime( fCurrentTime, fBeat, fBPS, bFreeze );
// Find the BGSegment we're in
const int i = FindBPMSegmentForBeat( fBeat );
/* Calls to Update() should *not* be scaled by music rate; fCurrentTime is. Undo it. */ /* Calls to Update() should *not* be scaled by music rate; fCurrentTime is. Undo it. */
const float fRate = GAMESTATE->m_SongOptions.m_fMusicRate; const float fRate = GAMESTATE->m_SongOptions.m_fMusicRate;
if( i != m_iCurBGChangeIndex ) // Find the BGSegment we're in
const int i = FindBGSegmentForBeat( fBeat );
if( i != -1 && i != m_iCurBGChangeIndex ) // we're changing backgrounds
{ {
LOG->Trace( "old bga %d -> new bga %d, %f, %f", i, m_iCurBGChangeIndex, m_aBGChanges[i].m_fStartBeat, fBeat ); LOG->Trace( "old bga %d -> new bga %d, %f, %f", i, m_iCurBGChangeIndex, m_aBGChanges[i].m_fStartBeat, fBeat );
@@ -493,7 +493,7 @@ void Background::UpdateCurBGChange( float fCurrentTime )
if( m_pCurrentBGA ) if( m_pCurrentBGA )
m_pCurrentBGA->Update( fDeltaTime ); m_pCurrentBGA->Update( fDeltaTime );
} }
else else // we're not changing backgrounds
{ {
/* This is affected by the music rate. */ /* This is affected by the music rate. */
float fDeltaTime = fCurrentTime - m_fLastMusicSeconds; float fDeltaTime = fCurrentTime - m_fLastMusicSeconds;
stepmania/src/Background.h
+1 -1
View File
@@ -42,7 +42,7 @@ protected:
const Song *m_pSong; const Song *m_pSong;
void LoadFromAniDir( CString sAniDir ); void LoadFromAniDir( CString sAniDir );
void LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing ); void LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing );
int FindBPMSegmentForBeat( float fBeat ) const; int FindBGSegmentForBeat( float fBeat ) const;
bool IsDangerPlayerVisible( PlayerNumber pn ); bool IsDangerPlayerVisible( PlayerNumber pn );
bool IsDangerAllVisible(); bool IsDangerAllVisible();