From f0d15f7bc3f3e8fa4bc6930f66c83966b06b6528 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 28 Feb 2005 04:43:14 +0000 Subject: [PATCH] remove redundancies with ScreenWithMenuElements --- stepmania/src/ScreenHowToPlay.cpp | 14 -------------- stepmania/src/ScreenHowToPlay.h | 1 - 2 files changed, 15 deletions(-) diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index bb9f127877..2113838072 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -17,7 +17,6 @@ #include "Style.h" #include "ActorUtil.h" -static const ThemeMetric SECONDS_TO_SHOW ("ScreenHowToPlay","SecondsToShow"); static const ThemeMetric STEPFILE ("ScreenHowToPlay","Stepfile"); static const ThemeMetric NUM_PERFECTS ("ScreenHowToPlay","NumPerfects"); static const ThemeMetric NUM_MISSES ("ScreenHowToPlay","NumMisses"); @@ -80,15 +79,6 @@ void ScreenHowToPlay::Init() { ScreenAttract::Init(); - m_In.Load( THEME->GetPathB("ScreenHowToPlay","in") ); - m_In.StartTransitioning(); - - m_Out.Load( THEME->GetPathB("ScreenHowToPlay","out") ); - - m_Overlay.LoadFromAniDir( THEME->GetPathB("ScreenHowToPlay","overlay") ); - m_Overlay.PlayCommand("On"); - this->AddChild( &m_Overlay ); - if( (bool)USEPAD && DoesFileExist( GetAnimPath(ANIM_DANCE_PAD) ) ) { m_pmDancePad = new Model; @@ -186,10 +176,7 @@ void ScreenHowToPlay::Init() this->AddChild( m_pLifeMeterBar ); m_fFakeSecondsIntoSong = 0; - this->ClearMessageQueue(); - this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW ); - this->MoveToTail( &m_Overlay ); this->MoveToTail( &m_In ); this->MoveToTail( &m_Out ); } @@ -332,7 +319,6 @@ void ScreenHowToPlay::DrawPrimitives() DISPLAY->SetLighting( false ); } - m_Overlay.DrawPrimitives(); m_In.DrawPrimitives(); m_Out.DrawPrimitives(); } diff --git a/stepmania/src/ScreenHowToPlay.h b/stepmania/src/ScreenHowToPlay.h index f05def88d8..2a7524d523 100644 --- a/stepmania/src/ScreenHowToPlay.h +++ b/stepmania/src/ScreenHowToPlay.h @@ -23,7 +23,6 @@ public: protected: virtual void Step(); LifeMeterBar* m_pLifeMeterBar; - BGAnimation m_Overlay; Player* m_pPlayer; Model* m_pmCharacter; Model* m_pmDancePad;