# HG changeset patch
# User nemo
# Date 1269907360 0
# Node ID c8c6ac44f51b3810fc0a86608c4c2a4e2c415793
# Parent  c542c8e3cf772761dc0f22d3184755dbf5e8615e
prophylactic removal of some Integer references, raise a few of the template islands up a bit so they work inverted without triggering border

diff -r c542c8e3cf77 -r c8c6ac44f51b hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Mon Mar 29 23:47:38 2010 +0000
+++ b/hedgewars/GSHandlers.inc	Tue Mar 30 00:02:40 2010 +0000
@@ -1611,8 +1611,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepFlame(Gear: PGear);
-var i: Integer;
-gX,gY: LongInt;
+var gX,gY,i: LongInt;
 begin
     if (Gear^.State and gsttmpFlag) = 0 then AllInactive:= false;
 
diff -r c542c8e3cf77 -r c8c6ac44f51b hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Mon Mar 29 23:47:38 2010 +0000
+++ b/hedgewars/HHHandlers.inc	Tue Mar 30 00:02:40 2010 +0000
@@ -310,7 +310,7 @@
 procedure PickUp(HH, Gear: PGear);
 var s: shortstring;
     a: TAmmoType;
-    i: Integer;
+    i: LongInt;
     vga: PVisualGear;
 begin
 Gear^.Message:= gm_Destroy;
diff -r c542c8e3cf77 -r c8c6ac44f51b hedgewars/uLandTemplates.pas
--- a/hedgewars/uLandTemplates.pas	Mon Mar 29 23:47:38 2010 +0000
+++ b/hedgewars/uLandTemplates.pas	Tue Mar 30 00:02:40 2010 +0000
@@ -1482,10 +1482,10 @@
        (x:  240; y:1400; w:   5; h:  25),
        (x:  275; y:1510; w:   1; h:   1),
        (x: NTPX; y:   0; w:   1; h:   1),
-       (x:  450; y:1850; w: 100; h: 100),
+       (x:  450; y:1800; w: 100; h: 100),
        (x:  600; y:1750; w: 100; h: 100),
        (x:  750; y:1750; w: 100; h: 100),
-       (x:  950; y:1950; w: 100; h: 100),
+       (x:  950; y:1850; w: 100; h: 100),
        (x: NTPX; y:   0; w:   1; h:   1),
        (x: 1075; y:1450; w:   1; h:   1),
        (x: 1110; y:1300; w:   5; h:  25),
@@ -1499,10 +1499,10 @@
        (x: 2250; y:1150; w:  25; h: 100),
        (x: 2350; y:1250; w:  25; h: 100),
        (x: NTPX; y:   0; w:   1; h:   1),
-       (x: 1750; y:2047; w:   1; h:   1),
+       (x: 1750; y:2020; w:   1; h:   1),
        (x: 1900; y:1870; w:  50; h:  50),
        (x: 2050; y:1870; w:  50; h:  50),
-       (x: 2175; y:2047; w:   1; h:   1),
+       (x: 2175; y:2020; w:   1; h:   1),
        (x: NTPX; y:   0; w:   1; h:   1),
        (x: 2500; y:1700; w:   1; h:   1),
        (x: 2575; y:1500; w:  10; h:  50),
@@ -1524,10 +1524,10 @@
        (x: 2880; y: 950; w:  25; h:  25),
        (x: 2900; y:1150; w:   1; h:   1),
        (x: NTPX; y:   0; w:   1; h:   1),
-       (x: 3075; y:2047; w:   1; h:   1),
+       (x: 3075; y:1990; w:   1; h:   1),
        (x: 3325; y:1700; w:  50; h: 100),
        (x: 3475; y:1700; w:  50; h: 100),
-       (x: 3625; y:2047; w:   1; h:   1),
+       (x: 3625; y:1990; w:   1; h:   1),
        (x: NTPX; y:   0; w:   1; h:   1),
        (x: 3200; y:1450; w:   1; h:   1),
        (x: 3240; y:1350; w:  25; h:  25),
diff -r c542c8e3cf77 -r c8c6ac44f51b hedgewars/uMisc.pas
--- a/hedgewars/uMisc.pas	Mon Mar 29 23:47:38 2010 +0000
+++ b/hedgewars/uMisc.pas	Tue Mar 30 00:02:40 2010 +0000
@@ -98,8 +98,8 @@
     bWaterRising    : Boolean;
 
     ShowCrosshair   : boolean;
-    CursorMovementX : Integer;
-    CursorMovementY : Integer;
+    CursorMovementX : LongInt;
+    CursorMovementY : LongInt;
     cDrownSpeed : hwFloat;
     cMaxWindSpeed   : hwFloat;
     cWindSpeed  : hwFloat;
@@ -133,7 +133,7 @@
 procedure freeModule;
 procedure SplitBySpace(var a, b: shortstring);
 procedure SplitByChar(var a, b: ansistring; c: char);
-procedure movecursor(dx, dy: Integer);
+procedure movecursor(dx, dy: LongInt);
 function  hwSign(r: hwFloat): LongInt;
 function  Min(a, b: LongInt): LongInt;
 function  Max(a, b: LongInt): LongInt;
@@ -199,7 +199,7 @@
     end else b:= '';
 end;
 
-procedure movecursor(dx, dy: Integer);
+procedure movecursor(dx, dy: LongInt);
 var x, y: LongInt;
 begin
 if (dx = 0) and (dy = 0) then exit;
diff -r c542c8e3cf77 -r c8c6ac44f51b hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Mon Mar 29 23:47:38 2010 +0000
+++ b/hedgewars/uStore.pas	Tue Mar 30 00:02:40 2010 +0000
@@ -64,7 +64,7 @@
 procedure flipSurface(Surface: PSDL_Surface; Vertical: Boolean);
 //procedure rotateSurface(Surface: PSDL_Surface);
 procedure copyRotatedSurface(src, dest: PSDL_Surface); // this is necessary since width/height are read only in SDL
-procedure copyToXY(src, dest: PSDL_Surface; destX, destY: Integer);
+procedure copyToXY(src, dest: PSDL_Surface; destX, destY: LongInt);
 procedure RenderHealth(var Hedgehog: THedgehog);
 procedure AddProgress;
 procedure FinishProgress;
@@ -83,7 +83,7 @@
 type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple);
 
 var HHTexture: PTexture;
-    MaxTextureSize: Integer;
+    MaxTextureSize: LongInt;
     cGPUVendor: TGPUVendor;
 
 procedure Tint(r, g, b, a: Single);
@@ -1304,7 +1304,7 @@
            end;
 end;
 
-procedure copyToXY(src, dest: PSDL_Surface; destX, destY: Integer);
+procedure copyToXY(src, dest: PSDL_Surface; destX, destY: LongInt);
 var srcX, srcY, i, j, maxDest: LongInt;
     srcPixels, destPixels: PLongWordArray;
 begin