From 188929aca69791bc755db6562582acfcf10df2e5 Mon Sep 17 00:00:00 2001
From: b1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 4 May 2007 16:21:40 +0000
Subject: well... changed Button Reflections back to old behavior

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@173 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Menu/UMenuButton.pas    | 4 ++--
 Game/Code/Screens/UScreenSong.pas | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Game/Code')

diff --git a/Game/Code/Menu/UMenuButton.pas b/Game/Code/Menu/UMenuButton.pas
index 87ebbb89..fde808e2 100644
--- a/Game/Code/Menu/UMenuButton.pas
+++ b/Game/Code/Menu/UMenuButton.pas
@@ -434,7 +434,7 @@ begin
 
         //Draw
         glBegin(GL_QUADS);//Top Left
-          glColor4f(ColR * Int, ColG * Int, ColB * Int, (Alpha-0.3)*FadeProgress*FadeProgress*FadeProgress);
+          glColor4f(ColR * Int, ColG * Int, ColB * Int, Alpha-0.3);
           glTexCoord2f(TexX1*TexW, TexY2*TexH);
           glVertex3f(x, y+h*scaleH+ Spacing, z);
 
@@ -450,7 +450,7 @@ begin
           glVertex3f(x+w*scaleW, y+h*scaleH + h*scaleH/2 + Spacing, z);
 
           //Top Right
-          glColor4f(ColR * Int, ColG * Int, ColB * Int, (Alpha-0.3)*FadeProgress*FadeProgress*FadeProgress);
+          glColor4f(ColR * Int, ColG * Int, ColB * Int, Alpha-0.3);
           glTexCoord2f(TexX2*TexW, TexY2*TexH);
           glVertex3f(x+w*scaleW, y+h*scaleH + Spacing, z);
         glEnd;
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index b32571c8..e4ab8854 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1112,7 +1112,8 @@ begin
 
       Button[B].H := Abs(Theme.Song.Cover.H * cos(Angle*0.8));//Power(Z2, 3);
 
-      Button[B].Reflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
+//      Button[B].Reflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
+      Button[B].DeSelectReflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
 
       Button[B].Z := 0.95 - Abs(Pos) * 0.01;
 
@@ -1148,7 +1149,8 @@ begin
 
         Button[B].Y := Theme.Song.Cover.Y  - (Button[B].H - Theme.Song.Cover.H)*0.75;
 
-        Button[B].Reflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
+//        Button[B].Reflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
+        Button[B].DeSelectReflectionspacing := 15 * Button[B].H/Theme.Song.Cover.H;
 
         Diff := (Button[B].H - Theme.Song.Cover.H)/2;
 
-- 
cgit v1.2.3