# HG changeset patch # User koda # Date 1370382977 -7200 # Node ID 78f087fd3e5bd0d26d287b976b95925622436787 # Parent a269fe7090a02f626473bc4fd43dcd83ddc87cc9 parsing ok, stops at uGears diff -r a269fe7090a0 -r 78f087fd3e5b hedgewars/uAIAmmoTests.pas --- a/hedgewars/uAIAmmoTests.pas Tue Jun 04 23:48:44 2013 +0200 +++ b/hedgewars/uAIAmmoTests.pas Tue Jun 04 23:56:17 2013 +0200 @@ -244,7 +244,7 @@ or (y < 0) or (trunc(x) > LAND_WIDTH) or (trunc(y) > LAND_HEIGHT) - or not TestCollExcludingObjects(trunc(x), trunc(y), 5) + or (not TestCollExcludingObjects(trunc(x), trunc(y), 5)) or (timer = 0) end; EX:= trunc(x); diff -r a269fe7090a0 -r 78f087fd3e5b hedgewars/uAIMisc.pas --- a/hedgewars/uAIMisc.pas Tue Jun 04 23:48:44 2013 +0200 +++ b/hedgewars/uAIMisc.pas Tue Jun 04 23:56:17 2013 +0200 @@ -131,7 +131,7 @@ if (((Gear^.Kind = gtHedgehog) and (Gear <> ThinkingHH) and (Gear^.Health > Gear^.Damage) and - not(Gear^.Hedgehog^.Team^.hasgone)) or + (not Gear^.Hedgehog^.Team^.hasgone)) or ((Gear^.Kind = gtExplosives) and (Gear^.Health > Gear^.Damage)) or ((Gear^.Kind = gtMine) and @@ -401,7 +401,7 @@ dmg := trunc(dxdy * 25); exit(dmg) end - else if (Kind = gtExplosives) and not((abs(odX) > 0.15) or ((abs(odY) > 0.15) and (abs(odX) > 0.02))) and (dY > 0.2) then + else if (Kind = gtExplosives) and (not(abs(odX) > 0.15) or ((abs(odY) > 0.15) and (abs(odX) > 0.02))) and (dY > 0.2) then begin dmg := trunc(dy * 70); exit(dmg) @@ -453,7 +453,7 @@ dmg := trunc(dxdy * 50); exit(dmg) end - else if (Kind = gtExplosives) and not((abs(odX) > 0.15) or ((abs(odY) > 0.15) and (abs(odX) > 0.02))) and (dY > 0.2) then + else if (Kind = gtExplosives) and (not(abs(odX) > 0.15) or ((abs(odY) > 0.15) and (abs(odX) > 0.02))) and (dY > 0.2) then begin dmg := trunc(dy * 70); exit(dmg) @@ -610,7 +610,7 @@ pY:= Point.y-2; fallDmg:= 0; if (Flags and afSetSkip <> 0) then skip:= true; - if not(dead) and (Flags and afTrackFall <> 0) and (Score > 0) and (power < Score) then + if (not dead) and (Flags and afTrackFall <> 0) and (Score > 0) and (power < Score) then if (Kind = gtExplosives) and (State and gstTmpFlag = 0) and (((abs(dY) > 0.15) and (abs(dX) < 0.02)) or ((abs(dY) < 0.15) and (abs(dX) < 0.15))) then @@ -705,7 +705,7 @@ end; if dmg > 0 then begin - if not(dead) and (Score > 0) and (dmg < Score) then + if (not dead) and (Score > 0) and (dmg < Score) then begin pX:= Point.x; pY:= Point.y; diff -r a269fe7090a0 -r 78f087fd3e5b hedgewars/uGears.pas --- a/hedgewars/uGears.pas Tue Jun 04 23:48:44 2013 +0200 +++ b/hedgewars/uGears.pas Tue Jun 04 23:56:17 2013 +0200 @@ -442,7 +442,7 @@ if TurnTimeLeft > 0 then if CurrentHedgehog^.Gear <> nil then if ((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) and - (not(isInMultiShoot and (CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]))) then + (not (isInMultiShoot and (CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]))) then begin if (TurnTimeLeft = 5000) and (cHedgehogTurnTime >= 10000)