# HG changeset patch # User unc0rr # Date 1370604184 -14400 # Node ID 6b51a32e48ed55e54b4ab59c6e0141dd1c71a85d # Parent 1b3014e53eeef78fb14f0b58075472c855d638e1 Fix more warnings (lol @ icegun "consts") diff -r 1b3014e53eee -r 6b51a32e48ed hedgewars/GSHandlers.inc --- 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) diff -r 1b3014e53eee -r 6b51a32e48ed hedgewars/uAIAmmoTests.pas --- 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 diff -r 1b3014e53eee -r 6b51a32e48ed hedgewars/uChat.pas --- 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