From a2539871abfbd2c50ef763350cc56fa5ef45f2d4 Mon Sep 17 00:00:00 2001
From: mota23 <mota23@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 17 Apr 2007 13:33:35 +0000
Subject: Well, heres my first commit since R11. Some minor skin changes, new
 skin.ini-entry LyricHelpBar

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@102 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UDraw.pas    | 27 ++++++++++++++++++++-------
 Game/Code/Classes/UGraphic.pas |  7 ++++---
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'Game')

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index 7eaddac4..410fbb2e 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -663,24 +663,37 @@ begin
     Rec.Top := Skin_LyricsT + 3;
     Rec.Bottom := Rec.Top + 33;//SingScreen.LyricMain.Size * 3;
 
-    // zapalanie
+{    // zapalanie
     BarAlpha := (BarWspol*10) * 0.5;
     if BarAlpha > 0.5 then BarAlpha := 0.5;
 
     // gaszenie
-    if BarWspol > 0.95 then BarAlpha := 0.5 * (1 - (BarWspol - 0.95) * 20);
+    if BarWspol > 0.95 then BarAlpha := 0.5 * (1 - (BarWspol - 0.95) * 20);}
+
     //Change fuer Crazy Joker
-    glEnable(GL_BLEND);
-    glBegin(GL_QUADS);
+
+  glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glBindTexture(GL_TEXTURE_2D, Tex_Lyric_Help_Bar.TexNum);
+  glBegin(GL_QUADS);
+    glColor4f(1, 1, 1, 0);
+    glTexCoord2f(1/16, 1/16); glVertex2f(Rec.Left, Rec.Top);
+    glTexCoord2f(1/16, 15/16); glVertex2f(Rec.Left, Rec.Bottom);
+    glColor4f(1, 1, 1, 0.5);
+    glTexCoord2f(15/16, 15/16); glVertex2f(Rec.Right, Rec.Bottom);
+    glTexCoord2f(15/16, 1/16); glVertex2f(Rec.Right, Rec.Top);
+    glEnd;
+    glDisable(GL_BLEND);
+{    glBegin(GL_QUADS);
       glColor4f(26/255, 165/255, 220/255, 0);
       glVertex2f(Rec.Left, Rec.Top);
       glVertex2f(Rec.Left, Rec.Bottom);
       glColor4f(26/255, 165/255, 220/255, BarAlpha);
       glVertex2f(Rec.Right, Rec.Bottom);
       glVertex2f(Rec.Right, Rec.Top);
-    glEnd;
-    glDisable(GL_BLEND);
-  end;
+    glEnd;}
+   end;
 
   // oscilloscope
   if Ini.Oscilloscope = 1 then begin
diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas
index c3ce0f00..b909e49f 100644
--- a/Game/Code/Classes/UGraphic.pas
+++ b/Game/Code/Classes/UGraphic.pas
@@ -76,6 +76,7 @@ var
 
 
   Tex_Ball:       TTexture;
+  Tex_Lyric_Help_Bar: TTexture;
   FullScreen:     boolean;
 
 
@@ -191,9 +192,9 @@ begin
   end;
 
   Tex_Note_Perfect_Star := Texture.LoadTexture(pchar(Skin.GetTextureFileName('NotePerfectStar')), 'JPG', 'Font Black', 0);
-  Tex_Note_Star := Texture.LoadTexture(pchar(Skin.GetTextureFileName('NoteStar')) , 'JPG', 'Alpha Black Colored', $FFFFFF);
-  Tex_Ball :=      Texture.LoadTexture(pchar(Skin.GetTextureFileName('Ball')), 'BMP', 'Transparent', $FF00FF);
-
+  Tex_Note_Star :=   Texture.LoadTexture(pchar(Skin.GetTextureFileName('NoteStar')) , 'JPG', 'Alpha Black Colored', $FFFFFF);
+  Tex_Ball :=        Texture.LoadTexture(pchar(Skin.GetTextureFileName('Ball')), 'BMP', 'Transparent', $FF00FF);
+  Tex_Lyric_Help_Bar := Texture.LoadTexture(pchar(Skin.GetTextureFileName('LyricHelpBar')), 'BMP', 'Transparent', $FF00FF);
 
 
   //SingBar Mod
-- 
cgit v1.2.3