From eae951f9bfd1c14900e0145fd9b87454aa2b993f Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 7 Nov 2004 07:13:40 +0000
Subject: [PATCH] use SCREEN_* in metrics

---
 stepmania/Themes/default/metrics.ini | 16 +++++------
 stepmania/Themes/techno/metrics.ini  | 42 ++++++++++++----------------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 201cfca6a2..2173eac050 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -424,7 +424,7 @@ MemoryCardIcons=1
 StartX=0
 StartY=-136
 SpacingX=0
-SpacingY=240-212
+SpacingY=28
 GainFocusGroupCommand=stoptweening;linear,0.2;x,-40
 LoseFocusGroupCommand=stoptweening;linear,0.2;x,0
 GainFocusItemCommand=glowshift;effectperiod,0.5
@@ -440,7 +440,7 @@ NumColumns=4
 NumRows=10
 StartX=0
 StartY=0
-SpacingX=320-170
+SpacingX=150
 CropWidth=146
 InitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5;
 
@@ -2906,10 +2906,10 @@ SwitchSeconds=0.10
 RouletteSwitchSeconds=0.05
 RouletteSlowDownSwitches=5
 LockedInitialVelocity=7
-ScrollBarX=320-172
+ScrollBarX=148
 ScrollBarHeight=368
-ItemCurveX=320-235
-ItemSpacingY=240-194
+ItemCurveX=85
+ItemSpacingY=46
 NoCurving=0
 NumWheelItems=13
 MusicWheelItemStartOnCommand=addx,SCREEN_WIDTH/2
@@ -3827,7 +3827,7 @@ CategoryY=SCREEN_CENTER_Y+190
 CategoryZoom=0.7
 CharsZoomSmall=1.0
 CharsZoomLarge=1.5
-CharsSpacingY=240-200
+CharsSpacingY=40
 ScrollingCharsColor=0.6,0.8,0.8,1
 SelectedCharsColor=0.8,1,1,1
 ReceptorArrowsY=SCREEN_CENTER_Y-140
@@ -4175,8 +4175,8 @@ AttackIconsP1StartX=SCREEN_CENTER_X-192
 AttackIconsP1StartY=SCREEN_CENTER_Y+116
 AttackIconsP2StartX=SCREEN_CENTER_X+168
 AttackIconsP2StartY=SCREEN_CENTER_Y+116
-AttackIconsSpacingX=320-278
-AttackIconsSpacingY=240-208
+AttackIconsSpacingX=42
+AttackIconsSpacingY=32
 AttackIconsP1OnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 AttackIconsP1OffCommand=sleep,0.2;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 AttackIconsP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
diff --git a/stepmania/Themes/techno/metrics.ini b/stepmania/Themes/techno/metrics.ini
index 1a4acabc3a..d3ea9f03a3 100644
--- a/stepmania/Themes/techno/metrics.ini
+++ b/stepmania/Themes/techno/metrics.ini
@@ -17,36 +17,36 @@ NextScreen5=ScreenSelectDifficulty
 NextScreen6=ScreenSelectDifficulty
 NextScreen7=ScreenSelectDifficulty
 NextScreen8=ScreenSelectDifficulty
-Icon1X=60
-Icon1Y=84
+Icon1X=SCREEN_CENTER_X-260
+Icon1Y=SCREEN_CENTER_Y-156
 Icon1OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon1OffCommand=bouncebegin,0.5;zoomy,0
-Icon2X=140
-Icon2Y=84
+Icon2X=SCREEN_CENTER_X-180
+Icon2Y=SCREEN_CENTER_Y-156
 Icon2OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon2OffCommand=bouncebegin,0.5;zoomy,0
-Icon3X=220
-Icon3Y=84
+Icon3X=SCREEN_CENTER_X-100
+Icon3Y=SCREEN_CENTER_Y-156
 Icon3OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon3OffCommand=bouncebegin,0.5;zoomy,0
-Icon4X=300
-Icon4Y=84
+Icon4X=SCREEN_CENTER_X-20
+Icon4Y=SCREEN_CENTER_Y-156
 Icon4OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon4OffCommand=bouncebegin,0.5;zoomy,0
-Icon5X=380
-Icon5Y=84
+Icon5X=SCREEN_CENTER_X+60
+Icon5Y=SCREEN_CENTER_Y-156
 Icon5OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon5OffCommand=bouncebegin,0.5;zoomy,0
-Icon6X=60
-Icon6Y=164
+Icon6X=SCREEN_CENTER_X-260
+Icon6Y=SCREEN_CENTER_Y-76
 Icon6OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon6OffCommand=bouncebegin,0.5;zoomy,0
-Icon7X=140
-Icon7Y=164
+Icon7X=SCREEN_CENTER_X-180
+Icon7Y=SCREEN_CENTER_Y-76
 Icon7OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon7OffCommand=bouncebegin,0.5;zoomy,0
-Icon8X=220
-Icon8Y=164
+Icon8X=SCREEN_CENTER_X-100
+Icon8Y=SCREEN_CENTER_Y-76
 Icon8OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
 Icon8OffCommand=bouncebegin,0.5;zoomy,0
 
@@ -96,13 +96,11 @@ LifeType=2,together
 LifeTypeDefault=
 LifeType,1=mod,bar;name,Bar
 LifeType,2=mod,battery;name,Battery
-
 BarDrain=3,together
 BarDrainDefault=
 BarDrain,1=mod,normal-drain;name,Normal
 BarDrain,2=mod,norecover;name,NoRecover
 BarDrain,3=mod,suddendeath;name,SuddenDeath
-
 BatLives=10,together
 BatLivesDefault=
 BatLives,1=mod,1 life;name,1
@@ -115,18 +113,15 @@ BatLives,7=mod,7 lives;name,7
 BatLives,8=mod,8 lives;name,8
 BatLives,9=mod,9 lives;name,9
 BatLives,10=mod,10 lives;name,10
-
 Fail=3,together
 FailDefault=
 Fail,1=mod,failImmediate;name,Immediate
 Fail,2=mod,failendofsong;name,EndOfSong
 Fail,3=mod,failoff;name,Off
-
 AssistTick=2,together
 AssistTickDefault=
 AssistTick,1=mod,no assisttick;name,Off
 AssistTick,2=mod,assisttick;name,On
-
 Rate=18,together
 RateDefault=
 Rate,1=mod,0.3xmusic;name,0.3x
@@ -147,13 +142,12 @@ Rate,15=mod,1.7xmusic;name,1.7x
 Rate,16=mod,1.8xmusic;name,1.8x
 Rate,17=mod,1.9xmusic;name,1.9x
 Rate,18=mod,2.0xmusic;name,2.0x
-
 AutoAdjust=2,together
 AutoAdjustDefault=
 AutoAdjust,1=mod,no autosync;name,Off
 AutoAdjust,2=mod,autosync;name,On
-
 SaveScores=2,together
 SaveScoresDefault=
 SaveScores,1=mod,no savescore;name,Off
-SaveScores,2=mod,savescore;name,On
\ No newline at end of file
+SaveScores,2=mod,savescore;name,On
+