Mercurial Mercurial > hedgewars / 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.
Fix more warnings (lol @ icegun "consts")
authorunc0rr
Fri, 07 Jun 2013 15:23:04 +0400
changeset 9145 6b51a32e48ed
parent 9143 1b3014e53eee
child 9147 0ab57cdf9346
Fix more warnings (lol @ icegun "consts")
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uAIAmmoTests.pas file | annotate | diff | comparison | revisions
hedgewars/uChat.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Fri Jun 07 12:51:09 2013 +0400
+++ b/hedgewars/GSHandlers.inc	Fri Jun 07 15:23:04 2013 +0400
@@ -5122,13 +5122,13 @@
 end;
 
 procedure doStepIceGun(Gear: PGear);
-const iceWaitCollision:Longint = 0;
-const iceCollideWithGround:Longint = 1;
+const iceWaitCollision = 0;
+const iceCollideWithGround = 1;
 //const iceWaitNextTarget:Longint = 2;
 //const iceCollideWithHog:Longint = 4;
-const iceCollideWithWater:Longint = 5;
+const iceCollideWithWater = 5;
 //const waterFreezingTime:Longint = 500;
-const groundFreezingTime:Longint = 1000;
+const groundFreezingTime = 1000;
 const iceRadius = 32;
 const iceHeight = 40;
 var
@@ -5218,7 +5218,7 @@
                                 if vg <> nil then
                                     begin
                                     i:= random(100) + 155;
-                                    vg^.Tint:= i shl 24 or i shl 16 or $FF shl 8 or Longword(random(200) + 55);
+                                    vg^.Tint:= (i shl 24) or (i shl 16) or ($FF shl 8) or (random(200) + 55);
                                     vg^.Angle:= random(360);
                                     vg^.dx:= 0.001 * random(80);
                                     vg^.dy:= 0.001 * random(80)
--- a/hedgewars/uAIAmmoTests.pas	Fri Jun 07 12:51:09 2013 +0400
+++ b/hedgewars/uAIAmmoTests.pas	Fri Jun 07 15:23:04 2013 +0400
@@ -330,7 +330,7 @@
 function TestMolotov(Me: PGear; Targ: TTarget; Level: LongInt; var ap: TAttackParams): LongInt;
 var Vx, Vy, r: real;
     Score, EX, EY, valueResult: LongInt;
-    TestTime: Longword;
+    TestTime: LongInt;
     x, y, dY, meX, meY: real;
     t: LongInt;
 begin
@@ -382,7 +382,7 @@
 const tDelta = 24;
 var Vx, Vy, r: real;
     Score, EX, EY, valueResult: LongInt;
-    TestTime: Longword;
+    TestTime: LongInt;
     x, y, meX, meY, dY: real;
     t: LongInt;
 begin
--- a/hedgewars/uChat.pas	Fri Jun 07 12:51:09 2013 +0400
+++ b/hedgewars/uChat.pas	Fri Jun 07 15:23:04 2013 +0400
@@ -48,8 +48,8 @@
     LocalStrs: array[0 .. MaxStrIndex] of shortstring;
     missedCount: LongWord;
     lastStr: LongWord;
-    localLastStr: LongWord;
-    history: LongWord;
+    localLastStr: LongInt;
+    history: LongInt;
     visibleCount: LongWord;
     InputStr: TChatLine;
     InputStrL: array[0..260] of char; // for full str + 4-byte utf-8 char
hedgewars