From f91602a117ca03e9237f041953a462716c4c43f8 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 5 Nov 2008 22:30:47 +0000
Subject: fontsTTF.ini -> fonts.ini

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1503 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/game/fonts/fonts.ini    | 11 +++++++++++
 unicode/game/fonts/fontsTTF.ini | 11 -----------
 unicode/src/base/TextGL.pas     | 12 +-----------
 3 files changed, 12 insertions(+), 22 deletions(-)
 create mode 100644 unicode/game/fonts/fonts.ini
 delete mode 100644 unicode/game/fonts/fontsTTF.ini

diff --git a/unicode/game/fonts/fonts.ini b/unicode/game/fonts/fonts.ini
new file mode 100644
index 00000000..a705d665
--- /dev/null
+++ b/unicode/game/fonts/fonts.ini
@@ -0,0 +1,11 @@
+[Normal]
+File=FreeSans/FreeSans.ttf
+
+[Bold]
+File=FreeSans/FreeSansBold.ttf
+
+[Outline1]
+File=DejaVu/DejaVuSans-Bold.ttf
+
+[Outline2]
+File=FreeSans/FreeSansBold.ttf
diff --git a/unicode/game/fonts/fontsTTF.ini b/unicode/game/fonts/fontsTTF.ini
deleted file mode 100644
index a705d665..00000000
--- a/unicode/game/fonts/fontsTTF.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Normal]
-File=FreeSans/FreeSans.ttf
-
-[Bold]
-File=FreeSans/FreeSansBold.ttf
-
-[Outline1]
-File=DejaVu/DejaVuSans-Bold.ttf
-
-[Outline2]
-File=FreeSans/FreeSansBold.ttf
diff --git a/unicode/src/base/TextGL.pas b/unicode/src/base/TextGL.pas
index e3724e9c..2bc68637 100644
--- a/unicode/src/base/TextGL.pas
+++ b/unicode/src/base/TextGL.pas
@@ -88,14 +88,12 @@ end;
 procedure BuildFont;
 var
   FontIni: TMemIniFile;
-  //BitmapFont: TBitmapFont;
   FontFile: string;
 begin
   ActFont := 0;
 
   SetLength(Fonts, 4);
-  FontIni := TMemIniFile.Create(FontPath + 'fontsTTF.ini');
-  //FontIni := TMemIniFile.Create(FontPath + 'fonts.ini');
+  FontIni := TMemIniFile.Create(FontPath + 'fonts.ini');
 
   try
 
@@ -105,14 +103,6 @@ begin
     //Fonts[0].Font.GlyphSpacing := 1.4;
     //Fonts[0].Font.Aspect := 1.2;
 
-    {
-    BitmapFont := TBitmapFont.Create(FontFile, 0, 19, 35, -10);
-    BitmapFont.CorrectWidths(2, 0);
-    Fonts[0].Font := TScalableFont.Create(BitmapFont, false);
-    }
-
-    //Fonts[0].Font.Aspect := 0.9;
-
     // Bold
     FontFile := FindFontFile(FontIni, 'Bold');
     Fonts[1].Font := TFTScalableFont.Create(FontFile, 64);
-- 
cgit v1.2.3