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

fix m_bAttackEndedThisUpdate being true when an attack begins

Browse Source 
fix course global mods tweening
This commit is contained in:
Glenn Maynard
2004-02-07 06:11:36 +00:00
parent 36ffb71851
commit d2ee4ddb01
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+3 -2
View File
@@ -281,13 +281,14 @@ void GameState::Update( float fDelta )
{ {
Attack &attack = m_ActiveAttacks[p][s]; Attack &attack = m_ActiveAttacks[p][s];
const bool bCurrentlyEnabled = const bool bCurrentlyEnabled =
attack.fStartSecond == -1 ||
(attack.fStartSecond < this->m_fMusicSeconds && (attack.fStartSecond < this->m_fMusicSeconds &&
m_fMusicSeconds < attack.fStartSecond+attack.fSecsRemaining); m_fMusicSeconds < attack.fStartSecond+attack.fSecsRemaining);
if( m_ActiveAttacks[p][s].bOn == bCurrentlyEnabled ) if( m_ActiveAttacks[p][s].bOn == bCurrentlyEnabled )
continue; /* OK */ continue; /* OK */
if( !m_ActiveAttacks[p][s].bOn && bCurrentlyEnabled ) if( m_ActiveAttacks[p][s].bOn && !bCurrentlyEnabled )
m_bAttackEndedThisUpdate[p] = true; m_bAttackEndedThisUpdate[p] = true;
bRebuildPlayerOptions = true; bRebuildPlayerOptions = true;
stepmania/src/ScreenGameplay.cpp
+3 -1
View File
@@ -808,8 +808,10 @@ void ScreenGameplay::SetupSong( int p, int iSongIndex )
if( GAMESTATE->m_ActiveAttacks[p][s].fStartSecond == 0 ) if( GAMESTATE->m_ActiveAttacks[p][s].fStartSecond == 0 )
GAMESTATE->m_ActiveAttacks[p][s].fStartSecond = -1; GAMESTATE->m_ActiveAttacks[p][s].fStartSecond = -1;
} }
/* Update attack bOn flags. */
GAMESTATE->Update(0);
GAMESTATE->RebuildPlayerOptionsFromActiveAttacks( (PlayerNumber)p ); GAMESTATE->RebuildPlayerOptionsFromActiveAttacks( (PlayerNumber)p );
/* Snap. */
GAMESTATE->m_CurrentPlayerOptions[p] = GAMESTATE->m_PlayerOptions[p]; GAMESTATE->m_CurrentPlayerOptions[p] = GAMESTATE->m_PlayerOptions[p];
NoteData pOriginalNoteData; NoteData pOriginalNoteData;