From 467e742c7c03c78f0de5053cfe012cf6a9299960 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 24 Mar 2007 14:01:23 +0000
Subject: Changed Fonts from BMP to PNG

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@24 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/TextGL.pas                         |   8 ++++----
 Game/Code/UltraStar.rc                               |  12 +++++-------
 Game/Fonts/Bold/Font 1024 Bold.dat                   | Bin 256 -> 256 bytes
 Game/Fonts/Normal/Font Normal.dat                    | Bin 256 -> 256 bytes
 Game/Fonts/Outline 1/Outline 36 (1024).dat           | Bin 256 -> 256 bytes
 Game/Fonts/Outline 2/5 - Outline Dark Edited 16c.PNG | Bin 0 -> 49019 bytes
 Game/Fonts/Outline 2/Outline.dat                     | Bin 256 -> 256 bytes
 7 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 Game/Fonts/Outline 2/5 - Outline Dark Edited 16c.PNG

diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index cf09e48b..0f4ae82e 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -62,25 +62,25 @@ begin
   ActFont := 0;
 
   SetLength(Fonts, 5);
-  Fonts[0].Tex := Texture.LoadTexture(true, 'Font', 'BMP', 'Font', 0);
+  Fonts[0].Tex := Texture.LoadTexture(true, 'Font', 'PNG', 'Font', 0);
   Fonts[0].Tex.H := 30;
   Fonts[0].AspectW := 0.9;
   Fonts[0].Done := -1;
   Fonts[0].Outline := 0;
 
-  Fonts[1].Tex := Texture.LoadTexture(true, 'FontB', 'BMP', 'Font', 0);
+  Fonts[1].Tex := Texture.LoadTexture(true, 'FontB', 'PNG', 'Font', 0);
   Fonts[1].Tex.H := 30;
   Fonts[1].AspectW := 1;
   Fonts[1].Done := -1;
   Fonts[1].Outline := 0;
 
-  Fonts[2].Tex := Texture.LoadTexture(true, 'FontO', 'BMP', 'Font Outline', 0);
+  Fonts[2].Tex := Texture.LoadTexture(true, 'FontO', 'PNG', 'Font Outline', 0);
   Fonts[2].Tex.H := 30;
   Fonts[2].AspectW := 0.95;
   Fonts[2].Done := -1;
   Fonts[2].Outline := 5;
 
-  Fonts[3].Tex := Texture.LoadTexture(true, 'FontO2', 'BMP', 'Font Outline 2', 0);
+  Fonts[3].Tex := Texture.LoadTexture(true, 'FontO2', 'PNG', 'Font Outline 2', 0);
   Fonts[3].Tex.H := 30;
   Fonts[3].AspectW := 0.95;
   Fonts[3].Done := -1;
diff --git a/Game/Code/UltraStar.rc b/Game/Code/UltraStar.rc
index 22ee2142..0ae2b756 100644
--- a/Game/Code/UltraStar.rc
+++ b/Game/Code/UltraStar.rc
@@ -1,15 +1,13 @@
-Button    JPG "..\Graphics\MusicWheelItem song.jpg"
-
-Font      BMP "..\Fonts\Normal\Font Normal 16.bmp"
+Font      PNG "..\Fonts\Normal\Font Normal 16.PNG"
 Font      FNT "..\Fonts\Normal\Font Normal.dat"
 
-FontB     BMP "..\Fonts\Bold\Font 1024 Bold 16.bmp"
+FontB     PNG "..\Fonts\Bold\Font 1024 Bold 16.PNG"
 FontB     FNT "..\Fonts\Bold\Font 1024 Bold.dat"
 
-FontO     BMP "..\Fonts\Outline 1\Outline 36 (1024) 16c.bmp"
+FontO     PNG "..\Fonts\Outline 1\Outline 36 (1024) 16c.PNG"
 FontO     FNT "..\Fonts\Outline 1\Outline 36 (1024).dat"
 
-FontO2    BMP "..\Fonts\Outline 2\5 - Outline Dark Edited 16c.bmp"
+FontO2    PNG "..\Fonts\Outline 2\5 - Outline Dark Edited 16c.PNG"
 FontO2    FNT "..\Fonts\Outline 2\Outline.dat"
 
-MAINICON      ICON "..\Graphics\us.ico"
+MAINICON      ICON "..\Graphics\us.ico"
\ No newline at end of file
diff --git a/Game/Fonts/Bold/Font 1024 Bold.dat b/Game/Fonts/Bold/Font 1024 Bold.dat
index 280a6cb4..ea9f2484 100644
Binary files a/Game/Fonts/Bold/Font 1024 Bold.dat and b/Game/Fonts/Bold/Font 1024 Bold.dat differ
diff --git a/Game/Fonts/Normal/Font Normal.dat b/Game/Fonts/Normal/Font Normal.dat
index 1b517a0e..b4f02d90 100644
Binary files a/Game/Fonts/Normal/Font Normal.dat and b/Game/Fonts/Normal/Font Normal.dat differ
diff --git a/Game/Fonts/Outline 1/Outline 36 (1024).dat b/Game/Fonts/Outline 1/Outline 36 (1024).dat
index 280a6cb4..ea9f2484 100644
Binary files a/Game/Fonts/Outline 1/Outline 36 (1024).dat and b/Game/Fonts/Outline 1/Outline 36 (1024).dat differ
diff --git a/Game/Fonts/Outline 2/5 - Outline Dark Edited 16c.PNG b/Game/Fonts/Outline 2/5 - Outline Dark Edited 16c.PNG
new file mode 100644
index 00000000..d0a0a390
Binary files /dev/null and b/Game/Fonts/Outline 2/5 - Outline Dark Edited 16c.PNG differ
diff --git a/Game/Fonts/Outline 2/Outline.dat b/Game/Fonts/Outline 2/Outline.dat
index 9f1042e6..ea9f2484 100644
Binary files a/Game/Fonts/Outline 2/Outline.dat and b/Game/Fonts/Outline 2/Outline.dat differ
-- 
cgit v1.2.3