From 4c34cb5e200a4cdcdfaba52789e7d9a23a84dab6 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Wed, 23 Jun 2010 17:38:15 +0000 Subject: - fixed fading of player notes - fixed golden note twinkle - added support for more than one EDITION tag in one txt - added support for more than one GENRE tag in one txt - "move text to right" and "move all notes left/right" for duet songs in editor git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2557 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UDraw.pas | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Game/Code/Classes/UDraw.pas') diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index fd9219ce..0d0a710b 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -386,7 +386,6 @@ begin end; } end; - glColor4f(1, 1, 1, Alpha); glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -414,7 +413,7 @@ begin Rec.Top := Y - (Ton-Czesci[CP].Czesc[Czesci[CP].Akt].BaseNote)*Space/2 - NotesH2; Rec.Bottom := Rec.Top + 2 *NotesH2; - glColor3f(1, 1, 1); + glColor4f(1, 1, 1, Alpha); glBindTexture(GL_TEXTURE_2D, Tex_Left[NrGracza+1].TexNum); glBegin(GL_QUADS); glTexCoord2f(0, 0); glVertex2f(Rec.Left, Rec.Top); @@ -442,7 +441,6 @@ begin glTexCoord2f(1, 1); glVertex2f(Rec.Right, Rec.Bottom); glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top); glEnd; - glColor3f(1, 1, 1); // prawa czesc Rec.Left := Rec.Right; @@ -480,7 +478,7 @@ begin // some kind of weird index into a colour-table if (Ini.EffectSing=1) then - GoldenRec.GoldenNoteTwinkle(Rec.Top,Rec.Bottom,Rec.Right, NrGracza); + GoldenRec.GoldenNoteTwinkle(Rec.Top,Rec.Bottom,Rec.Right, NrGracza, CP); end; // if end; -- cgit v1.2.3