From 6fb0ba3c7e0ebe4f9a582b0f900008a29c3edd1e Mon Sep 17 00:00:00 2001
From: Andrew Livy <frieza@users.sourceforge.net>
Date: Thu, 5 Sep 2002 22:25:14 +0000
Subject: [PATCH] Fixes: ScreenStage Ez2dancer Fonts and Things.

---
 stepmania/TODO.andy           |  9 ++++++++-
 stepmania/src/ScreenStage.cpp | 13 ++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/stepmania/TODO.andy b/stepmania/TODO.andy
index 3d15476ca4..ac48286810 100644
--- a/stepmania/TODO.andy
+++ b/stepmania/TODO.andy
@@ -3,6 +3,13 @@ X denotes task complete or no longer required to do.
 - denotes task to do, but also being worked upon by other dev.
 H denotes task on hold.
 
+
+
+
+TODO As of: 11:42:PM 05/09/02
+
+Fix the Bug on ScreenStage that reports the current stage number for final stage as being 00 in Ez2 
+
 TODO As of: 01:29:AM 04/09/02
 
 X Fix Ez2dancer SelectPlayer Theme Metrics
@@ -12,7 +19,7 @@ X Fix Ez2dancer SelectPlayer Theme Metrics
 * Create Ez2dancer style song select.
 * Add Scoreboard System (longterm project)
 * Create some kind of metrics so that Ez2dancer may have extra stage the way it should
-* Fix Ez2dancer type stage screens
+X Fix Ez2dancer type stage screens
 - Create Ez2dancer type "extra stage" stage screen.
 * Modify Gameplay Screen Metrics so that Ez2dancer style screen is more arcade-accurate
 * Modify DEMO Play Screen so that Ez2dancer shows each style (double, real, e.t.c.) in the way it should.
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index b9f3ec7050..b7c0f61bf3 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -107,7 +107,10 @@ ScreenStage::ScreenStage()
 	for( int i=0; i<4; i++ )
 	{
 		m_sprNumbers[i].Load( THEME->GetPathTo("Graphics","stage numbers") );
-		m_sprNumbers[i].SetDiffuse( GAMESTATE->GetStageColor() );
+
+		if( g_StageType != STAGE_TYPE_EZ2 ) // DONT DIFFUSE COLORS FOR EZ2. Coz we actually set the color in the .png
+			m_sprNumbers[i].SetDiffuse( GAMESTATE->GetStageColor() );
+
 		m_sprNumbers[i].StopAnimating();
 	}
 	m_sprStage.Load( THEME->GetPathTo("Graphics","stage stage") );	// we may load a different graphic into here later
@@ -272,7 +275,7 @@ ScreenStage::ScreenStage()
 			m_sprNumbers[i].SetZoom( 20.0f ); // make it really really big on-screen
 			m_sprNumbers[i].SetRotation( 10 ); // make this thing rotated
 			m_sprNumbers[i].BeginTweening(0.8f, Actor::TWEEN_BIAS_BEGIN );
-			m_sprNumbers[i].SetTweenZoom( 1.0f ); // shrink it down to it's proper size
+			m_sprNumbers[i].SetTweenZoom( 3.0f ); // shrink it down to it's proper size
 			m_sprNumbers[i].SetTweenRotationZ( 0 ); // make it rotate into place
 		}
 	
@@ -373,9 +376,9 @@ ScreenStage::ScreenStage()
 
 		for (i=0; i<2; i++) // specify the font file.
 		{
-			m_ez2ukm[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+			m_ez2ukm[i].LoadFromFont( THEME->GetPathTo("Fonts","Stage") );
 			m_ez2ukm[i].TurnShadowOff();
-			m_stagedesc[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+			m_stagedesc[i].LoadFromFont( THEME->GetPathTo("Fonts","Stage") );
 			m_stagedesc[i].TurnShadowOff();
 		}
 
@@ -489,7 +492,7 @@ ScreenStage::ScreenStage()
 
 
 		// write the stage name
-		m_stagename.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_stagename.LoadFromFont( THEME->GetPathTo("Fonts","Stage") );
 		m_stagename.TurnShadowOff();
 
 		m_stagename.SetXY( CENTER_X+400, CENTER_Y-30+element_y_offsets );  // set initial position