- correct drawing of short notes in 4/6-player mode on one screen

- rimshot022b.mp3 + 15db
- changed fonts: higher resolution esp. for medley countdown
- some other bugfixes and corrections
- update of installer files 

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2699 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 16 insertions, 11 deletions

diff --git a/Game/Code/Classes/UGraphicClasses.pas b/Game/Code/Classes/UGraphicClasses.pas
index d9aeb227..6f192af6 100644
--- a/Game/Code/Classes/UGraphicClasses.pas
+++ b/Game/Code/Classes/UGraphicClasses.pas
@@ -305,27 +305,32 @@ end;
 procedure TParticle.Draw(Alph: TAlpha);

 var L: Cardinal;

 begin

-  if ScreenAct = Screen then

+  if (ScreenAct = Screen) then

+  begin

     // this draws (multiple) texture(s) of our particle

+    glEnable(GL_TEXTURE_2D);

+    glBindTexture(GL_TEXTURE_2D, Tex);

+

+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

+    glEnable(GL_BLEND);

+

     for L:=0 to High(Col) do

     begin

       glColor4f(Col[L].r, Col[L].g, Col[L].b, Alpha*Alph[CP]);

 

-      glBindTexture(GL_TEXTURE_2D, Tex);

-      glEnable(GL_TEXTURE_2D);

-      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-      glEnable(GL_BLEND);

-

-      begin

-        glBegin(GL_QUADS);

+      glBegin(GL_QUADS);

         glTexCoord2f((1/16) * Frame, 0);          glVertex2f(X-W*Scale[L]*SizeMod, Y-H*Scale[L]*SizeMod);

         glTexCoord2f((1/16) * Frame + (1/16), 0); glVertex2f(X-W*Scale[L]*SizeMod, Y+H*Scale[L]*SizeMod);

         glTexCoord2f((1/16) * Frame + (1/16), 1); glVertex2f(X+W*Scale[L]*SizeMod, Y+H*Scale[L]*SizeMod);

         glTexCoord2f((1/16) * Frame, 1);          glVertex2f(X+W*Scale[L]*SizeMod, Y-H*Scale[L]*SizeMod);

-        glEnd;

-      end;

+      glEnd;

     end;

-  glcolor4f(1,1,1,1);

+

+    glDisable(GL_BLEND);

+    glDisable(GL_TEXTURE_2D);

+    glBindTexture(GL_TEXTURE_2D, 0);

+    glcolor4f(1,1,1,1);

+  end;

 end;

 // end of TParticle