From 8d8931999f0703e89eb43899fbcc9ac016f6cb3a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 3 Jul 2012 01:40:15 -0500 Subject: [PATCH] ...fix ScreenHowToPlay not showing notes. Yes, I'm surprised as you are. --- Docs/Changelog_sm5.txt | 4 ++++ src/ScreenHowToPlay.cpp | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 84b622c7b8..ae19b7ba25 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 ???? ?? | 20120??? -------------------------------------------------------------------------------- +2012/07/03 +---------- +* [ScreenHowToPlay] Actually shows notes again. [AJ] + 2012/07/02 ---------- * [ScreenHowToPlay] Run InitCommand on Characters if enabled. [AJ] diff --git a/src/ScreenHowToPlay.cpp b/src/ScreenHowToPlay.cpp index be997bae2e..16d5ae3f62 100644 --- a/src/ScreenHowToPlay.cpp +++ b/src/ScreenHowToPlay.cpp @@ -128,9 +128,11 @@ void ScreenHowToPlay::Init() if( USE_PLAYER ) { + GAMESTATE->SetMasterPlayerNumber(PLAYER_1); + m_pLifeMeterBar = new LifeMeterBar; - m_pLifeMeterBar->SetName("LifeMeterBar"); m_pLifeMeterBar->Load( GAMESTATE->m_pPlayerState[PLAYER_1], &STATSMAN->m_CurStageStats.m_player[PLAYER_1] ); + m_pLifeMeterBar->SetName("LifeMeterBar"); ActorUtil::LoadAllCommandsAndSetXY( m_pLifeMeterBar, m_sName ); m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES ); @@ -177,7 +179,6 @@ void ScreenHowToPlay::Init() // Don't show judgment PO_GROUP_ASSIGN( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_fBlind, 1.0f ); - GAMESTATE->SetMasterPlayerNumber(PLAYER_1); GAMESTATE->m_bDemonstrationOrJukebox = true; } @@ -248,7 +249,8 @@ void ScreenHowToPlay::Update( float fDelta ) { if( GAMESTATE->m_pCurSong != NULL ) { - GAMESTATE->UpdateSongPosition( m_fFakeSecondsIntoSong, GAMESTATE->m_pCurSong->m_SongTiming ); + RageTimer tm; + GAMESTATE->UpdateSongPosition( m_fFakeSecondsIntoSong, GAMESTATE->m_pCurSong->m_SongTiming, tm, true ); m_fFakeSecondsIntoSong += fDelta; static int iLastNoteRowCounted = 0;