From d8c84c39ed5d060e0c172e6fa478936a6337c147 Mon Sep 17 00:00:00 2001
From: mogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 23 Nov 2007 18:48:31 +0000
Subject: Fonts are readable again, didn't edit the outline fonts (will be done
 later, maybe)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@641 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/TextGL.pas              |  12 ++++++------
 Game/Fonts/Bold/eurostar_regular_bold.png | Bin 43167 -> 64896 bytes
 Game/Fonts/Normal/eurostar_regular.png    | Bin 23225 -> 46312 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Game')

diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index 7475da7a..ed897071 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -140,7 +140,7 @@ begin
 
   Log.LogStatus( 'Font' , '---------------------------');
   SetLength(Fonts, 5);
-  Fonts[0].Tex := Texture.LoadTexture(true, 'Font', 'PNG', 'Font', 0);
+  Fonts[0].Tex := Texture.LoadTexture(true, 'Font', 'PNG', 'Transparent', 0);
   Fonts[0].Tex.H := 30;
   Fonts[0].AspectW := 0.9;
   Fonts[0].Done := -1;
@@ -148,21 +148,21 @@ begin
 
   Log.LogStatus( 'FontB' , '---------------------------');
 
-  Fonts[1].Tex := Texture.LoadTexture(true, 'FontB', 'PNG', 'Font', 0);
+  Fonts[1].Tex := Texture.LoadTexture(true, 'FontB', 'PNG', 'Transparent', 0);
   Fonts[1].Tex.H := 30;
   Fonts[1].AspectW := 1;
   Fonts[1].Done := -1;
   Fonts[1].Outline := 0;
 
   Log.LogStatus( 'FontO' , '---------------------------');
-  Fonts[2].Tex := Texture.LoadTexture(true, 'FontO', 'PNG', 'Font Outline', 0);
+  Fonts[2].Tex := Texture.LoadTexture(true, 'FontO', 'PNG', 'Transparent', 0);
   Fonts[2].Tex.H := 30;
   Fonts[2].AspectW := 0.95;
   Fonts[2].Done := -1;
   Fonts[2].Outline := 5;
 
   Log.LogStatus( 'FontO2' , '---------------------------');
-  Fonts[3].Tex := Texture.LoadTexture(true, 'FontO2', 'PNG', 'Font Outline 2', 0);
+  Fonts[3].Tex := Texture.LoadTexture(true, 'FontO2', 'PNG', 'Transparent', 0);
   Fonts[3].Tex.H := 30;
   Fonts[3].AspectW := 0.95;
   Fonts[3].Done := -1;
@@ -262,7 +262,7 @@ begin
 
     glEnable(GL_TEXTURE_2D);
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glBindTexture(GL_TEXTURE_2D, TexNum);
 
     glBegin(GL_QUADS);
@@ -321,7 +321,7 @@ begin
 
   glEnable(GL_TEXTURE_2D);
   glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glBindTexture(GL_TEXTURE_2D, TexNum);
   glBegin(GL_QUADS);
     glTexCoord2f(TexX, TexY); glVertex2f(PL+XItal,  PT);
diff --git a/Game/Fonts/Bold/eurostar_regular_bold.png b/Game/Fonts/Bold/eurostar_regular_bold.png
index fe1bd868..02f21f5d 100644
Binary files a/Game/Fonts/Bold/eurostar_regular_bold.png and b/Game/Fonts/Bold/eurostar_regular_bold.png differ
diff --git a/Game/Fonts/Normal/eurostar_regular.png b/Game/Fonts/Normal/eurostar_regular.png
index d582f653..8a338965 100644
Binary files a/Game/Fonts/Normal/eurostar_regular.png and b/Game/Fonts/Normal/eurostar_regular.png differ
-- 
cgit v1.2.3