Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cardinal -> Longword
authorunc0rr
Thu, 05 Oct 2006 19:40:11 +0000
changeset 188 a7c2a61524c2
parent 187 96c3154efee5
child 189 33d147c69a83
Cardinal -> Longword
hedgewars/hwengine.dpr file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uLandGraphics.pas file | annotate | diff | comparison | revisions
hedgewars/uMisc.pas file | annotate | diff | comparison | revisions
hedgewars/uTeams.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/hwengine.dpr	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/hwengine.dpr	Thu Oct 05 19:40:11 2006 +0000
@@ -118,7 +118,7 @@
 ///////////////////
 procedure MainLoop;
 var PrevTime,
-    CurrTime: Cardinal;
+    CurrTime: Longword;
     event: TSDL_Event;
 begin
 PrevTime:= SDL_GetTicks;
--- a/hedgewars/uConsts.pas	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/uConsts.pas	Thu Oct 05 19:40:11 2006 +0000
@@ -88,7 +88,7 @@
                      cifTheme or
                      cifMap;
 
-      cTransparentColor: Cardinal = $000000;
+      cTransparentColor: Longword = $000000;
 
       cMaxHHIndex      = 7;
       cMaxHHs          = 20;
--- a/hedgewars/uGears.pas	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/uGears.pas	Thu Oct 05 19:40:11 2006 +0000
@@ -27,7 +27,7 @@
      TGear = record
              NextGear, PrevGear: PGear;
              Active: Boolean;
-             State : Cardinal;
+             State : Longword;
              X : Double;
              Y : Double;
              dX: Double;
@@ -36,7 +36,7 @@
              Pos: Longword;
              doStep: TGearStepProcedure;
              Radius: integer;
-             Angle, Power : Cardinal;
+             Angle, Power : Longword;
              DirAngle: Double;
              Timer : LongWord;
              Elasticity: Double;
@@ -49,7 +49,7 @@
              Surf: PSDL_Surface;
              end;
 
-function  AddGear(X, Y: integer; Kind: TGearType; State: Cardinal; const dX: Double=0.0; dY: Double=0.0; Timer: LongWord=0): PGear;
+function  AddGear(X, Y: integer; Kind: TGearType; State: Longword; const dX: Double=0.0; dY: Double=0.0; Timer: LongWord=0): PGear;
 procedure ProcessGears;
 procedure SetAllToActive;
 procedure SetAllHHToActive;
@@ -115,7 +115,7 @@
                                                                doStepActionTimer
                                                                );
 
-function AddGear(X, Y: integer; Kind: TGearType; State: Cardinal; const dX: Double=0.0; dY: Double=0.0; Timer: LongWord=0): PGear;
+function AddGear(X, Y: integer; Kind: TGearType; State: Longword; const dX: Double=0.0; dY: Double=0.0; Timer: LongWord=0): PGear;
 const Counter: Longword = 0;
 begin
 inc(Counter);
--- a/hedgewars/uLandGraphics.pas	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/uLandGraphics.pas	Thu Oct 05 19:40:11 2006 +0000
@@ -161,9 +161,9 @@
 
 for i:= 0 to Pred(Count) do
     begin
-    for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
+    for ty:= max(y - Radius, 0) to min(y + Radius, 1023) do
         for tx:= max(0, ar[i].Left - Radius) to min(2047, ar[i].Right + Radius) do
-            ClearLandPixel(y + ty, tx);
+            ClearLandPixel(ty, tx);
     inc(y, dY)
     end;
 
@@ -172,10 +172,10 @@
 
 for i:= 0 to Pred(Count) do
     begin
-    for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
+    for ty:= max(y - Radius, 0) to min(y + Radius, 1023) do
         for tx:= max(0, ar[i].Left - Radius) to min(2047, ar[i].Right + Radius) do
-            if Land[y + ty, tx] = $FFFFFF then
-                  SetLandPixel(y + ty, tx);
+            if Land[ty, tx] = $FFFFFF then
+                  SetLandPixel(ty, tx);
     inc(y, dY)
     end;
 
--- a/hedgewars/uMisc.pas	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/uMisc.pas	Thu Oct 05 19:40:11 2006 +0000
@@ -37,7 +37,7 @@
     cCloudsNumber    : integer = 9;
     cConsoleHeight   : integer = 320;
     cConsoleYAdd     : integer = 0; 
-    cTimerInterval   : Cardinal = 5;
+    cTimerInterval   : Longword = 5;
     cScreenWidth     : integer = 1024;
     cScreenHeight    : integer = 768;
     cBits            : integer = 16;
@@ -50,11 +50,11 @@
 
     GameTicks     : LongWord = 0;
 
-    cSkyColor     : Cardinal = 0;
-    cWaterColor   : Cardinal = $005ACE;
-    cWhiteColor   : Cardinal = $FFFFFF;
-    cConsoleSplitterColor : Cardinal = $FF0000;
-    cColorNearBlack       : Cardinal = 16;
+    cSkyColor     : Longword = 0;
+    cWaterColor   : Longword = $005ACE;
+    cWhiteColor   : Longword = $FFFFFF;
+    cConsoleSplitterColor : Longword = $FF0000;
+    cColorNearBlack       : Longword = 16;
     cExplosionBorderColor : LongWord = $808080;
 
     cDrownSpeed   : Double = 0.06;
@@ -148,7 +148,7 @@
 if not Assert then OutError(SDL_GetError, isFatal)
 end;
 
-procedure AdjustColor(var Color: Cardinal);
+procedure AdjustColor(var Color: Longword);
 begin
 Color:= SDL_MapRGB(PixelFormat, (Color shr 16) and $FF, (Color shr 8) and $FF, Color and $FF)
 end;
--- a/hedgewars/uTeams.pas	Thu Oct 05 18:44:14 2006 +0000
+++ b/hedgewars/uTeams.pas	Thu Oct 05 19:40:11 2006 +0000
@@ -38,7 +38,7 @@
      THHAmmo   = array[0..cMaxSlotIndex, 0..cMaxSlotAmmoIndex] of TAmmo;
      TTeam = record
              Next: PTeam;
-             Color: Cardinal;
+             Color: Longword;
              TeamName: string[MAXNAMELEN];
              ExtDriven: boolean;
              Binds: TBinds;
hedgewars-draft