From 8192d7b49025a849b9cff72d76b46c61dcd2104a Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 17 Aug 2008 06:47:37 +0000
Subject: [PATCH] use StandardDecoration for GraphDisplay and ComboGraph so
 that positions and commands are loaded from metrics

---
 .../default.lua                               | 17 ++++++++++------
 stepmania/Themes/default/Scripts/ActorDef.lua |  6 +++++-
 stepmania/Themes/default/metrics.ini          | 20 +++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
index e992badfc8..b4c75971f2 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
@@ -29,12 +29,17 @@ end
 
 local t = LoadFallbackB();
 
-t[#t+1] = GraphDisplay(PLAYER_1) .. {
-	InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y-16;draworder,1;);
-};
-t[#t+1] = GraphDisplay(PLAYER_2) .. {
-	InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y-16;draworder,1;);
-};
+if ShowStandardDecoration("GraphDisplay") then
+	for pn in ivalues(PlayerNumber) do
+		t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. PlayerNumber:ToString()[pn], GraphDisplay(pn) );
+	end
+end
+
+if ShowStandardDecoration("ComboGraph") then
+	for pn in ivalues(PlayerNumber) do
+		t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. PlayerNumber:ToString()[pn], ComboGraph(pn) );
+	end
+end
 
 t[#t+1] = ComboGraph(PLAYER_1) .. {
 	InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y+10;draworder,1;);
diff --git a/stepmania/Themes/default/Scripts/ActorDef.lua b/stepmania/Themes/default/Scripts/ActorDef.lua
index e87c5e0b8a..9a2cd71880 100644
--- a/stepmania/Themes/default/Scripts/ActorDef.lua
+++ b/stepmania/Themes/default/Scripts/ActorDef.lua
@@ -186,11 +186,15 @@ function StandardDecorationFromFile( MetricsName, FileName )
 end
 
 function StandardDecorationFromFileOptional( MetricsName, FileName )
-	if THEME:GetMetric(Var "LoadingScreen","Show"..MetricsName) then
+	if ShowStandardDecoration(MetricsName) then
 		return StandardDecorationFromFile( MetricsName, FileName );
 	end
 end
 
+function ShowStandardDecoration( MetricsName )
+	return THEME:GetMetric(Var "LoadingScreen","Show"..MetricsName)
+end
+
 
 -- (c) 2006 Glenn Maynard
 -- All rights reserved.
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5b333d7046..943ea8eeda 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1499,6 +1499,26 @@ BarActual5P2Y=SCREEN_CENTER_Y+36
 BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
 BarActual5P2OffCommand=linear,0.7;diffusealpha,0
 
+ShowGraphDisplay=true
+GraphDisplayP1X=SCREEN_CENTER_X-222
+GraphDisplayP1Y=SCREEN_CENTER_Y-16
+GraphDisplayP1OnCommand=draworder,1
+GraphDisplayP1OffCommand=
+GraphDisplayP2X=SCREEN_CENTER_X+222
+GraphDisplayP2Y=SCREEN_CENTER_Y-16
+GraphDisplayP2OnCommand=draworder,1
+GraphDisplayP2OffCommand=
+
+ShowComboGraph=true
+ComboGraphP1X=SCREEN_CENTER_X-222
+ComboGraphP1Y=SCREEN_CENTER_Y-10
+ComboGraphP1OnCommand=draworder,1
+ComboGraphP1OffCommand=
+ComboGraphP2X=SCREEN_CENTER_X+222
+ComboGraphP2Y=SCREEN_CENTER_Y-10
+ComboGraphP2OnCommand=draworder,1
+ComboGraphP2OffCommand=
+
 BarActualMaxCommand=glowshift;effectperiod,0.5
 
 CheerDelaySeconds=2.5