From 1258b0c22f2d29c651fe62e6fc0851c45ce208a7 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 14 Jan 2003 05:56:18 +0000
Subject: [PATCH] Fixed "floating background".  Fixed interaction between
 COLOR_NOTE, and APPEARANCE_*

---
 stepmania/src/BGAnimationLayer.cpp | 30 ++++++++++++++++--------------
 stepmania/src/NoteDisplay.cpp      |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 9d31b75630..cf51d5e009 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -53,7 +53,22 @@ BGAnimationLayer::BGAnimationLayer()
 	m_iNumSprites = 0;
 	m_bCycleColor = false;
 	m_bCycleAlpha = false;
-	m_Effect = EFFECT_STRETCH_STILL;	
+	m_Effect = EFFECT_STRETCH_STILL;
+
+	m_PosX = 0;
+	m_PosY = 0;
+	m_Zoom = 0;
+	m_Rot = 0;
+	m_ShowTime = 0;
+	m_HideTime = 0;
+	m_TweenStartTime = 0;
+	m_TweenX = 0.0;
+	m_TweenY = 0.0;
+	m_TweenSpeed = 0;
+	m_TweenState = 0;
+	m_TweenPassedX = 0;
+	m_TweenPassedY = 0;
+
 }
 
 /* Static background layers are simple, uncomposited background images with nothing
@@ -92,19 +107,6 @@ void BGAnimationLayer::LoadFromVisualization( CString sMoviePath )
 void BGAnimationLayer::LoadFromAniLayerFile( CString sPath, CString sSongBGPath )
 {
 	sPath.MakeLower();
-	m_PosX = 0;
-	m_PosY = 0;
-	m_Zoom = 0;
-	m_Rot = 0;
-	m_ShowTime = 0;
-	m_HideTime = 0;
-	m_TweenStartTime = 0;
-	m_TweenX = 0.0;
-	m_TweenY = 0.0;
-	m_TweenSpeed = 0;
-	m_TweenState = 0;
-	m_TweenPassedX = 0;
-	m_TweenPassedY = 0;
 
 	if( sPath.Find("usesongbg") != -1 )
 	{
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index e04856efe7..22551dd377 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -335,7 +335,7 @@ void NoteDisplay::DrawTap( const int iCol, const float fBeat, const bool bOnSame
 		diffuse.g *= noteColor.g;
 		diffuse.b *= noteColor.b;
 
-		glow = RageColor(1,1,1,1)*fGlow + noteColor*(1-fGlow)*0.5f;
+		glow = RageColor(1,1,1,1)*fGlow + noteColor*(1-fGlow)*0.7f*fAlpha;
 	}
 
 	if( bOnSameRowAsHoldStart  &&  g_bDrawHoldHeadForTapsOnSameRow )