Fixed BeginnerHelper bugs

This commit is contained in:
Kevin Slaughter
2003-08-20 09:58:11 +00:00
parent e8a977310a
commit 5f9520285e
2 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -81,6 +81,7 @@ Player::Player()
for( int c=0; c<MAX_NOTE_TRACKS; c++ ) for( int c=0; c<MAX_NOTE_TRACKS; c++ )
this->AddChild( &m_HoldJudgment[c] ); this->AddChild( &m_HoldJudgment[c] );
PlayerAI::InitFromDisk(); PlayerAI::InitFromDisk();
} }
@@ -166,7 +167,6 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, Combine
// they change depending on PlayerOptions. // they change depending on PlayerOptions.
m_sLastSeenNoteSkin = GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin; m_sLastSeenNoteSkin = GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_sNoteSkin;
m_soundMineExplosion.Load( THEME->GetPathToS("Player explosion") ); m_soundMineExplosion.Load( THEME->GetPathToS("Player explosion") );
} }
+3 -4
View File
@@ -785,7 +785,7 @@ void ScreenGameplay::LoadNextSong()
{ {
// Beginner steps are always the same on both players.. Just get the # of 1 player that's using the Beginner steps, and go on. // Beginner steps are always the same on both players.. Just get the # of 1 player that's using the Beginner steps, and go on.
for( int pb=0; pb<NUM_PLAYERS; pb++ ) for( int pb=0; pb<NUM_PLAYERS; pb++ )
if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_PreferredDifficulty[pb] ) if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_PreferredDifficulty[pb] == DIFFICULTY_BEGINNER )
m_iPOB = pb; m_iPOB = pb;
m_Background.Unload(); // BeginnerHelper has it's own BG control. m_Background.Unload(); // BeginnerHelper has it's own BG control.
@@ -995,6 +995,8 @@ void ScreenGameplay::Update( float fDeltaTime )
if( PREFSMAN->m_bShowBeginnerHelper ) if( PREFSMAN->m_bShowBeginnerHelper )
{ {
int iStep = 0; int iStep = 0;
if( (m_Player[m_iPOB].IsThereATapAtRow( BeatToNoteRowNotRounded((GAMESTATE->m_fSongBeat+0.1f)) ) ) )
m_BeginnerHelper.FlashOnce();
if((m_Player[m_iPOB].IsThereATapAtRow( BeatToNoteRowNotRounded((GAMESTATE->m_fSongBeat+0.45f))))) if((m_Player[m_iPOB].IsThereATapAtRow( BeatToNoteRowNotRounded((GAMESTATE->m_fSongBeat+0.45f)))))
{ {
for( int k=0; k<m_Player[m_iPOB].GetNumTracks(); k++ ) for( int k=0; k<m_Player[m_iPOB].GetNumTracks(); k++ )
@@ -1185,10 +1187,7 @@ void ScreenGameplay::Update( float fDeltaTime )
} }
} }
if( GAMESTATE->m_SongOptions.m_bAssistTick && IsTimeToPlayTicks()) if( GAMESTATE->m_SongOptions.m_bAssistTick && IsTimeToPlayTicks())
{
m_soundAssistTick.Play(); m_soundAssistTick.Play();
m_BeginnerHelper.FlashOnce();
}
} }