equal
deleted
inserted
replaced
1375 dec(i); |
1375 dec(i); |
1376 Gear:= t^.ar[i]; |
1376 Gear:= t^.ar[i]; |
1377 if (Ammo^.Kind in [gtDEagleShot, gtSniperRifleShot, gtMinigunBullet, |
1377 if (Ammo^.Kind in [gtDEagleShot, gtSniperRifleShot, gtMinigunBullet, |
1378 gtFirePunch, gtKamikaze, gtWhip, gtShover]) |
1378 gtFirePunch, gtKamikaze, gtWhip, gtShover]) |
1379 and (((Ammo^.Data <> nil) and (PGear(Ammo^.Data) = Gear)) |
1379 and (((Ammo^.Data <> nil) and (PGear(Ammo^.Data) = Gear)) |
1380 or (not UpdateHitOrder(Gear, Ammo^.WDTimer))) then |
1380 or (not UpdateHitOrder( |
|
1381 Gear, |
|
1382 Ammo^.WDTimer, |
|
1383 (Ammo^.Kind = gtMinigunBullet) and (Gear^.Pos <> 0)))) then |
1381 continue; |
1384 continue; |
1382 |
1385 |
1383 if ((Ammo^.Kind = gtFlame) or (Ammo^.Kind = gtBlowTorch)) and |
1386 if ((Ammo^.Kind = gtFlame) or (Ammo^.Kind = gtBlowTorch)) and |
1384 (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then |
1387 (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then |
1385 Gear^.Hedgehog^.Effects[heFrozen]:= max(255,Gear^.Hedgehog^.Effects[heFrozen]-10000); |
1388 Gear^.Hedgehog^.Effects[heFrozen]:= max(255,Gear^.Hedgehog^.Effects[heFrozen]-10000); |