From 406a2d1085cc16e3e1529c1657dbbccc77cf8889 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 6 Nov 2004 23:54:34 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenHowToPlay.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index 5f1a27e0a9..1c35380cc2 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -20,13 +20,10 @@ static const ThemeMetric NUM_PERFECTS ("ScreenHowToPlay","NumPerfects"); static const ThemeMetric NUM_MISSES ("ScreenHowToPlay","NumMisses"); // static const ThemeMetric USELIFEBAR ("ScreenHowToPlay","UseLifeMeterBar"); -static const ThemeMetric LIFEBARONCOMMAND ("ScreenHowToPlay","LifeMeterBarOnCommand"); // static const ThemeMetric USECHARACTER ("ScreenHowToPlay","UseCharacter"); -static const ThemeMetric CHARACTERONCOMMAND ("ScreenHowToPlay","CharacterOnCommand"); // static const ThemeMetric USEPAD ("ScreenHowToPlay","UsePad"); -static const ThemeMetric PADONCOMMAND ("ScreenHowToPlay","PadOnCommand"); // static const ThemeMetric USEPLAYER ("ScreenHowToPlay","UseNotefield"); static const ThemeMetric PLAYERX ("ScreenHowToPlay","PlayerX"); @@ -90,9 +87,10 @@ ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) if( (bool)USEPAD && DoesFileExist( GetAnimPath(ANIM_DANCE_PAD) ) ) { m_pmDancePad = new Model; + m_pmDancePad->SetName( "Pad" ); m_pmDancePad->LoadMilkshapeAscii( GetAnimPath(ANIM_DANCE_PAD) ); m_pmDancePad->SetRotationX( 35 ); - m_pmDancePad->Command( PADONCOMMAND ); + SET_XY_AND_ON_COMMAND( m_pmDancePad ); } // Display random character @@ -119,7 +117,7 @@ ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) m_pmCharacter->SetRotationX( 40 ); m_pmCharacter->SetCullMode( CULL_NONE ); // many of the DDR PC character models have the vertex order flipped - m_pmCharacter->Command( CHARACTERONCOMMAND ); + SET_XY_AND_ON_COMMAND( m_pmCharacter ); } } @@ -127,8 +125,9 @@ ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) if( USELIFEBAR ) { m_pLifeMeterBar = new LifeMeterBar; + m_pLifeMeterBar->SetName("LifeMeterBar"); m_pLifeMeterBar->Load( PLAYER_1 ); - m_pLifeMeterBar->Command( LIFEBARONCOMMAND ); + SET_XY_AND_ON_COMMAND( m_pLifeMeterBar ); m_pLifeMeterBar->FillForHowToPlay( NUM_PERFECTS, NUM_MISSES ); }