equal
deleted
inserted
replaced
647 end |
647 end |
648 else*) |
648 else*) |
649 begin |
649 begin |
650 if (Gear <> CurrentHedgehog^.Gear) or (CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtKamikaze) then |
650 if (Gear <> CurrentHedgehog^.Gear) or (CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtKamikaze) then |
651 Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; |
651 Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; |
652 if (hwRound(Gear^.Y) >= cWaterLine) then |
652 if CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y)) then |
653 begin |
653 begin |
654 t:= max(Gear^.Damage, Gear^.Health); |
654 t:= max(Gear^.Damage, Gear^.Health); |
655 Gear^.Damage:= t; |
655 Gear^.Damage:= t; |
656 if (((not SuddenDeathDmg) and (WaterOpacity < $FF)) or (SuddenDeathDmg and (WaterOpacity < $FF))) |
656 if (((not SuddenDeathDmg) and (WaterOpacity < $FF)) or (SuddenDeathDmg and (SDWaterOpacity < $FF))) then |
657 and (hwRound(Gear^.Y) < cWaterLine + 256) then |
|
658 spawnHealthTagForHH(Gear, t); |
657 spawnHealthTagForHH(Gear, t); |
659 end; |
658 end; |
660 |
659 |
661 team:= Gear^.Hedgehog^.Team; |
660 team:= Gear^.Hedgehog^.Team; |
662 if CurrentHedgehog^.Gear = Gear then |
661 if CurrentHedgehog^.Gear = Gear then |