equal
deleted
inserted
replaced
1305 if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0) and isInMultiShoot then |
1305 if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0) and isInMultiShoot then |
1306 AllInactive:= true |
1306 AllInactive:= true |
1307 else if not isInMultiShoot then |
1307 else if not isInMultiShoot then |
1308 AllInactive:= false; |
1308 AllInactive:= false; |
1309 |
1309 |
1310 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) or (LuaEndTurnRequested = true) then |
1310 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) or (((GameFlags and gfKing) <> 0) and (not Hedgehog^.Team^.hasKing)) or (LuaEndTurnRequested = true) then |
1311 begin |
1311 begin |
1312 if (Hedgehog^.CurAmmoType = amKnife) then |
1312 if (Hedgehog^.CurAmmoType = amKnife) then |
1313 LoadHedgehogHat(Hedgehog^, Hedgehog^.Hat); |
1313 LoadHedgehogHat(Hedgehog^, Hedgehog^.Hat); |
1314 if TagTurnTimeLeft = 0 then |
1314 if TagTurnTimeLeft = 0 then |
1315 TagTurnTimeLeft:= TurnTimeLeft; |
1315 TagTurnTimeLeft:= TurnTimeLeft; |