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

remove redundancies with ScreenWithMenuElements

Browse Source
This commit is contained in:
Chris Danford
2005-02-28 04:43:14 +00:00
parent ca09e21104
commit f0d15f7bc3
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenHowToPlay.cpp
-14
View File
@@ -17,7 +17,6 @@
#include "Style.h" #include "Style.h"
#include "ActorUtil.h" #include "ActorUtil.h"
static const ThemeMetric<float> SECONDS_TO_SHOW ("ScreenHowToPlay","SecondsToShow");
static const ThemeMetric<CString> STEPFILE ("ScreenHowToPlay","Stepfile"); static const ThemeMetric<CString> STEPFILE ("ScreenHowToPlay","Stepfile");
static const ThemeMetric<int> NUM_PERFECTS ("ScreenHowToPlay","NumPerfects"); static const ThemeMetric<int> NUM_PERFECTS ("ScreenHowToPlay","NumPerfects");
static const ThemeMetric<int> NUM_MISSES ("ScreenHowToPlay","NumMisses"); static const ThemeMetric<int> NUM_MISSES ("ScreenHowToPlay","NumMisses");
@@ -80,15 +79,6 @@ void ScreenHowToPlay::Init()
{ {
ScreenAttract::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) ) ) if( (bool)USEPAD && DoesFileExist( GetAnimPath(ANIM_DANCE_PAD) ) )
{ {
m_pmDancePad = new Model; m_pmDancePad = new Model;
@@ -186,10 +176,7 @@ void ScreenHowToPlay::Init()
this->AddChild( m_pLifeMeterBar ); this->AddChild( m_pLifeMeterBar );
m_fFakeSecondsIntoSong = 0; m_fFakeSecondsIntoSong = 0;
this->ClearMessageQueue();
this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW );
this->MoveToTail( &m_Overlay );
this->MoveToTail( &m_In ); this->MoveToTail( &m_In );
this->MoveToTail( &m_Out ); this->MoveToTail( &m_Out );
} }
@@ -332,7 +319,6 @@ void ScreenHowToPlay::DrawPrimitives()
DISPLAY->SetLighting( false ); DISPLAY->SetLighting( false );
} }
m_Overlay.DrawPrimitives();
m_In.DrawPrimitives(); m_In.DrawPrimitives();
m_Out.DrawPrimitives(); m_Out.DrawPrimitives();
} }
stepmania/src/ScreenHowToPlay.h
-1
View File
@@ -23,7 +23,6 @@ public:
protected: protected:
virtual void Step(); virtual void Step();
LifeMeterBar* m_pLifeMeterBar; LifeMeterBar* m_pLifeMeterBar;
BGAnimation m_Overlay;
Player* m_pPlayer; Player* m_pPlayer;
Model* m_pmCharacter; Model* m_pmCharacter;
Model* m_pmDancePad; Model* m_pmDancePad;