equal
deleted
inserted
replaced
1405 gtFirePunch, gtKamikaze, gtWhip, gtShover]) |
1405 gtFirePunch, gtKamikaze, gtWhip, gtShover]) |
1406 and (((Ammo^.Data <> nil) and (PGear(Ammo^.Data) = Gear)) |
1406 and (((Ammo^.Data <> nil) and (PGear(Ammo^.Data) = Gear)) |
1407 or (not UpdateHitOrder( |
1407 or (not UpdateHitOrder( |
1408 Gear, |
1408 Gear, |
1409 Ammo^.WDTimer, |
1409 Ammo^.WDTimer, |
1410 (Ammo^.Kind = gtMinigunBullet) and (Gear^.Pos <> 0)))) then |
1410 (Ammo^.Kind = gtMinigunBullet) and (Ammo^.Pos <> 0)))) then |
1411 continue; |
1411 continue; |
1412 |
1412 |
1413 if ((Ammo^.Kind = gtFlame) or (Ammo^.Kind = gtBlowTorch)) and |
1413 if ((Ammo^.Kind = gtFlame) or (Ammo^.Kind = gtBlowTorch)) and |
1414 (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then |
1414 (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then |
1415 Gear^.Hedgehog^.Effects[heFrozen]:= max(255,Gear^.Hedgehog^.Effects[heFrozen]-10000); |
1415 Gear^.Hedgehog^.Effects[heFrozen]:= max(255,Gear^.Hedgehog^.Effects[heFrozen]-10000); |