From 5c2d7c5bd3e7d7cdf4b4c01a9c58d259b69ca491 Mon Sep 17 00:00:00 2001
From: Kevin Slaughter <miryokuteki@users.sourceforge.net>
Date: Tue, 26 Aug 2003 07:44:22 +0000
Subject: [PATCH] Added flashing red light ala previous DDR mixes during DANGER
 animation on the dancing characters.

---
 stepmania/src/Background.cpp        | 7 ++++++-
 stepmania/src/DancingCharacters.cpp | 8 +++++++-
 stepmania/src/DancingCharacters.h   | 3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 7543abdff5..b79a7711ae 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -392,7 +392,7 @@ void Background::Update( float fDeltaTime )
 		m_BGADanger.Update( fDeltaTime );
 	}
 	else
-	{			
+	{
 		if( GAMESTATE->m_fMusicSeconds == GameState::MUSIC_SECONDS_INVALID )
 			return; /* hasn't been updated yet */
 
@@ -463,10 +463,13 @@ void Background::DrawPrimitives()
 	
 	if( IsDangerVisible() )
 	{
+		// Since this only shows when DANGER is visible, it will flash red on it's own accord :)
+		m_pDancingCharacters->m_bDrawDangerLight = true;
 		m_BGADanger.Draw();
 	}
 	else
 	{	
+		m_pDancingCharacters->m_bDrawDangerLight = false;
 		if( m_pCurrentBGA )
 			m_pCurrentBGA->Draw();
 		if( m_pFadingBGA )
@@ -474,7 +477,9 @@ void Background::DrawPrimitives()
 	}
 
 	if( m_pDancingCharacters )
+	{
 		m_pDancingCharacters->Draw();
+	}
 
 	m_quadBGBrightness.Draw();
 	for( int i=0; i<4; i++ )
diff --git a/stepmania/src/DancingCharacters.cpp b/stepmania/src/DancingCharacters.cpp
index e5dd5d04fa..1b319b5b04 100644
--- a/stepmania/src/DancingCharacters.cpp
+++ b/stepmania/src/DancingCharacters.cpp
@@ -42,6 +42,7 @@ const float MODEL_X_TWO_PLAYERS[NUM_PLAYERS] = { +8, -8 };
 
 DancingCharacters::DancingCharacters()
 {
+	m_bDrawDangerLight = false;
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
 		if( !GAMESTATE->IsPlayerEnabled(p) )
@@ -190,11 +191,16 @@ void DancingCharacters::DrawPrimitives()
 		m_LookAt,
 		RageVector3(0,1,0) );
 
+	RageColor	DL;
+	DL = RageColor(0.8f,0.8f,0.8f,0.8f);
+	if( m_bDrawDangerLight )
+		DL = RageColor(1,0,0,1);
+
 	DISPLAY->SetLighting( true );
 	DISPLAY->SetLightDirectional( 
 		0, 
 		RageColor(0.4f,0.4f,0.4f,1), 
-		RageColor(0.8f,0.8f,0.8f,0.8f),
+		DL,
 		RageColor(0.8f,0.8f,0.8f,0.8f),
 		RageVector3(+1, 0, +1) );
 
diff --git a/stepmania/src/DancingCharacters.h b/stepmania/src/DancingCharacters.h
index b1be9291d4..860c185f9e 100644
--- a/stepmania/src/DancingCharacters.h
+++ b/stepmania/src/DancingCharacters.h
@@ -25,7 +25,8 @@ public:
 
 	virtual void Update( float fDelta );
 	virtual void DrawPrimitives();
-	
+	bool	m_bDrawDangerLight;
+
 protected:
 
 	Model	m_Character[NUM_PLAYERS];