From dabb06dc4286eddcd4c5e106492ce08cb5a21b20 Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Wed, 27 Aug 2003 12:33:30 +0000 Subject: [PATCH] change the PlayerOnCommand metric into a PlayerX metric, since we really only want to change the horizontal position the arrows are at. --- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/ScreenHowToPlay.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 3757d2c53b..6f174e5cce 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2146,7 +2146,7 @@ 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 PadOnCommand=X,40;Y,310;Zoom,15;RotationY,180;sleep,4.7;linear,1.0;RotationY,360;Zoom,20;X,230;Y,390 -PlayerOnCommand=x,480;addx,320;linear,0.3;addx,-320 +PlayerX=480 [ScreenDemonstration] SecondsToShow=30 diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index a014b7d141..3955b399e8 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -29,7 +29,7 @@ #define USECHARACTER THEME->GetMetricB("ScreenHowToPlay","UseCharacter") #define CHARACTERONCOMMAND THEME->GetMetric ("ScreenHowToPlay","CharacterOnCommand") #define PADONCOMMAND THEME->GetMetric ("ScreenHowToPlay","PadOnCommand") -#define PLAYERONCOMMAND THEME->GetMetric ("ScreenHowToPlay","PlayerOnCommand") +#define PLAYERX THEME->GetMetricI("ScreenHowToPlay","PlayerX") ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") { @@ -131,7 +131,7 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay") GAMESTATE->m_PlayerController[PLAYER_1] = PC_AUTOPLAY; m_Player.Load( PLAYER_1, pND, &m_LifeMeterBar, NULL, NULL, NULL, NULL, NULL ); - m_Player.Command( PLAYERONCOMMAND ); + m_Player.SetX( PLAYERX ); // Don't show judgement GAMESTATE->m_PlayerOptions[PLAYER_1].m_fBlind = 1;