aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-09-19 13:26:58 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-09-19 13:26:58 +0000
commit5e01f4ab6d0f3dd5ffa011b2a5638d5248e99f0f (patch)
tree39848e69cc04a9604d8ea9bc9d173a64b9ae2e3e /Game
parentbf8524bf03d38784160ede29e3ab58c6455a17be (diff)
downloadusdx-5e01f4ab6d0f3dd5ffa011b2a5638d5248e99f0f.tar.gz
usdx-5e01f4ab6d0f3dd5ffa011b2a5638d5248e99f0f.tar.xz
usdx-5e01f4ab6d0f3dd5ffa011b2a5638d5248e99f0f.zip
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
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Classes/TextGL.pas2
-rw-r--r--Game/Code/Classes/UTexture.pas8
-rw-r--r--Game/Code/UltraStar.cfg43
3 files changed, 49 insertions, 4 deletions
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