# HG changeset patch
# User unc0rr
# Date 1160679120 0
# Node ID 993cf173218b32829e15f348065371885244e2e4
# Parent  edae828322a073147d9a43759d2182a33d71511c
 - Many small fixes
 - Let CMake use FreePascal 1.9.4

diff -r edae828322a0 -r 993cf173218b hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/CMakeLists.txt	Thu Oct 12 18:52:00 2006 +0000
@@ -24,12 +24,12 @@
 		string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" fpc_vers_minor "${fpc_version}")
 		string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" fpc_vers_patch "${fpc_version}")
 		math(EXPR fpc_ver "${fpc_vers_major}*10000 + ${fpc_vers_minor}*100 + ${fpc_vers_patch}")
-		if (fpc_ver LESS "010906")
-			message("Minimum required version of FreePascal is 1.9.6")
-		else (fpc_ver LESS "010906")
+		if (fpc_ver LESS "010904")
+			message("Minimum required version of FreePascal is 1.9.4")
+		else (fpc_ver LESS "010904")
 			set(pascal_compiler ${fpc_executable})
 			set(pascal_compiler_flags "-B" "-Sd" "-Xs" "-OG" "-O2" "-Cs2000000" ${hwengine_project})
-		endif (fpc_ver LESS "010906")
+		endif (fpc_ver LESS "010904")
 	endif (fpc_version)
 endif (dcc32version)
 
diff -r edae828322a0 -r 993cf173218b hedgewars/uAI.pas
--- a/hedgewars/uAI.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uAI.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -24,7 +24,7 @@
 
 implementation
 uses uTeams, uConsts, SDLh, uAIMisc, uGears, uAIAmmoTests, uAIActions, uMisc,
-     uAIThinkStack, uConsole;
+     uAIThinkStack;
 
 var BestActions: TActions;
     CanUseAmmo: array [TAmmoType] of boolean;
diff -r edae828322a0 -r 993cf173218b hedgewars/uConsole.pas
--- a/hedgewars/uConsole.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uConsole.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -33,7 +33,7 @@
 
 implementation
 {$J+}
-uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uSound, uWorld, uLand, uRandom;
+uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld, uLand, uRandom;
 const cLineWidth: integer = 0;
       cLinesCount = 256;
       
diff -r edae828322a0 -r 993cf173218b hedgewars/uGame.pas
--- a/hedgewars/uGame.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uGame.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -18,7 +18,6 @@
 
 unit uGame;
 interface
-uses SDLh;
 {$INCLUDE options.inc}
 
 procedure DoGameTick(Lag: integer);
diff -r edae828322a0 -r 993cf173218b hedgewars/uIO.pas
--- a/hedgewars/uIO.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uIO.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -34,7 +34,7 @@
 procedure NetGetNextCmd;
 
 implementation
-uses uConsole, uConsts, uWorld, uMisc, uRandom, uLand;
+uses uConsole, uConsts, uWorld, uMisc, uLand;
 const isPonged: boolean = false;
 var  IPCSock: PTCPSocket = nil;
      fds: PSDLNet_SocketSet;
diff -r edae828322a0 -r 993cf173218b hedgewars/uLand.pas
--- a/hedgewars/uLand.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uLand.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -18,7 +18,7 @@
 
 unit uLand;
 interface
-uses SDLh, uGears, uLandTemplates;
+uses SDLh, uLandTemplates;
 {$include options.inc}
 type TLandArray = packed array[0..1023, 0..2047] of LongWord;
      TPreview = packed array[0..127, 0..31] of byte;
@@ -32,7 +32,7 @@
 
 
 implementation
-uses uConsole, uStore, uMisc, uConsts, uRandom, uTeams, uIO, uLandObjects;
+uses uConsole, uStore, uMisc, uConsts, uRandom, uTeams, uLandObjects;
 
 type TPixAr = record
               Count: Longword;
diff -r edae828322a0 -r 993cf173218b hedgewars/uLandGraphics.pas
--- a/hedgewars/uLandGraphics.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uLandGraphics.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -12,7 +12,7 @@
 procedure FillRoundInLand(X, Y, Radius: integer; Value: Longword);
 
 implementation
-uses SDLh, uStore, uMisc, uLand, uConsts;
+uses SDLh, uMisc, uLand, uConsts;
 
 procedure FillCircleLines(x, y, dx, dy: integer; Value: Longword);
 var i: integer;
diff -r edae828322a0 -r 993cf173218b hedgewars/uMisc.pas
--- a/hedgewars/uMisc.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uMisc.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -110,7 +110,6 @@
 var f: textfile;
 {$ENDIF}
 
-
 function hwSign(r: Double): integer;
 begin
 if r < 0 then Result:= -1 else Result:= 1
diff -r edae828322a0 -r 993cf173218b hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uStore.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -43,7 +43,7 @@
  SDLPrimSurface: PSDL_Surface;
 
 implementation
-uses uMisc, uIO, uConsole, uLand, uCollisions;
+uses uMisc, uConsole, uLand;
 
 var StoreSurface,
        HHSurface: PSDL_Surface;
diff -r edae828322a0 -r 993cf173218b hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Wed Oct 11 19:37:48 2006 +0000
+++ b/hedgewars/uTeams.pas	Thu Oct 12 18:52:00 2006 +0000
@@ -72,7 +72,7 @@
 procedure SetWeapon(weap: TAmmoType);
 
 implementation
-uses uMisc, uStore, uWorld, uIO, uAI, uLocale, uConsole;
+uses uMisc, uWorld, uAI, uLocale, uConsole;
 const MaxTeamHealth: integer = 0;
 
 procedure FreeTeamsList; forward;