From b62a0c57262d1ec8bcb55240cd582cae502619aa Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Wed, 27 Aug 2003 14:40:41 +0000 Subject: [PATCH] add a UsePad metric to the HowToPlay screen. --- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/ScreenHowToPlay.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 6f174e5cce..0d82fccbd8 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2144,7 +2144,8 @@ NumPerfects=4 NumMisses=6 LifeMeterBarOnCommand=x,480;y,40;addy,-60;sleep,2.4;linear,0.2;addy,60 UseCharacter=1 -CharacterOnCommand=Zoom,20;X,120;Y,400;addy,-500;sleep,6.0;linear,0.4;addy,500 +CharacterOnCommand=Zoom,20;X,120;Y,400;addy,-500;sleep,6.0;decelerate,0.4;addy,500 +UsePad=1 PadOnCommand=X,40;Y,310;Zoom,15;RotationY,180;sleep,4.7;linear,1.0;RotationY,360;Zoom,20;X,230;Y,390 PlayerX=480 diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index 3955b399e8..6d32f19213 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -28,6 +28,7 @@ #define LIFEBARONCOMMAND THEME->GetMetric ("ScreenHowToPlay","LifeMeterBarOnCommand") #define USECHARACTER THEME->GetMetricB("ScreenHowToPlay","UseCharacter") #define CHARACTERONCOMMAND THEME->GetMetric ("ScreenHowToPlay","CharacterOnCommand") +#define USEPAD THEME->GetMetricB("ScreenHowToPlay","UsePad") #define PADONCOMMAND THEME->GetMetric ("ScreenHowToPlay","PadOnCommand") #define PLAYERX THEME->GetMetricI("ScreenHowToPlay","PlayerX") @@ -61,9 +62,12 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") m_LifeMeterBar.Command( LIFEBARONCOMMAND ); m_LifeMeterBar.FillForHowToPlay( NUM_PERFECTS, NUM_MISSES ); - m_mDancePad.LoadMilkshapeAscii("Characters" SLASH "DancePad-DDR.txt"); - m_mDancePad.SetRotationX( 35 ); - m_mDancePad.Command( PADONCOMMAND ); + if( USEPAD ) + { + m_mDancePad.LoadMilkshapeAscii("Characters" SLASH "DancePad-DDR.txt"); + m_mDancePad.SetRotationX( 35 ); + m_mDancePad.Command( PADONCOMMAND ); + } // Display random character+pad if( USECHARACTER && GAMESTATE->m_pCharacters.size() )