From 5e01f4ab6d0f3dd5ffa011b2a5638d5248e99f0f Mon Sep 17 00:00:00 2001
From: jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 19 Sep 2007 13:26:58 +0000
Subject: trying to fix lazarus runtime errors.. also adding files to make sure
 everything required for lazarus compile, is in svn.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@399 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/TextGL.pas   |  2 ++
 Game/Code/Classes/UTexture.pas |  8 ++++----
 Game/Code/UltraStar.cfg        | 43 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 Game/Code/UltraStar.cfg

(limited to 'Game/Code')

diff --git a/Game/Code/Classes/TextGL.pas b/Game/Code/Classes/TextGL.pas
index 12a9a8dc..b61e2657 100644
--- a/Game/Code/Classes/TextGL.pas
+++ b/Game/Code/Classes/TextGL.pas
@@ -73,12 +73,14 @@ procedure BuildFont;			                // Build Our Bitmap Font
   var
     Rejestr:  TResourceStream;
   begin
+    {$IFNDEF FPC}
     Rejestr := TResourceStream.Create(HInstance, aResourceName , pchar( aType ) );
     try
       Rejestr.Read(Fonts[ aID ].Width, 256);
     finally
       Rejestr.Free;
     end;
+    {$ENDIF}
   end;
 
 var
diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index c1862828..6895a250 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -870,10 +870,10 @@ begin
   Result.TexW := TexOrigW / TexNewW;
   Result.TexH := TexOrigH / TexNewH;
 
-  Result.Int := 1;
-  Result.ColR := 1;
-  Result.ColG := 1;
-  Result.ColB := 1;
+  Result.Int   := 1;
+  Result.ColR  := 1;
+  Result.ColG  := 1;
+  Result.ColB  := 1;
   Result.Alpha := 1;
 
   // 0.4.2 new test - default use whole texure, taking TexW and TexH as const and changing these
diff --git a/Game/Code/UltraStar.cfg b/Game/Code/UltraStar.cfg
new file mode 100644
index 00000000..23f26b7f
--- /dev/null
+++ b/Game/Code/UltraStar.cfg
@@ -0,0 +1,43 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-E"../../"
+-LE"C:\Documents and Settings\Jay Binks\My Documents\Borland Studio Projects\Bpl"
+-LN"C:\Documents and Settings\Jay Binks\My Documents\Borland Studio Projects\Bpl"
+-U"lib\JEDI-SDLv1.0\SDL\Pas"
+-O"lib\JEDI-SDLv1.0\SDL\Pas"
+-I"lib\JEDI-SDLv1.0\SDL\Pas"
+-R"lib\JEDI-SDLv1.0\SDL\Pas"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
-- 
cgit v1.2.3