equal
deleted
inserted
replaced
444 end; |
444 end; |
445 |
445 |
446 if TurnTimeLeft > 0 then |
446 if TurnTimeLeft > 0 then |
447 if CurrentHedgehog^.Gear <> nil then |
447 if CurrentHedgehog^.Gear <> nil then |
448 if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) |
448 if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) |
449 or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0)) |
449 or (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking <> 0) |
|
450 or ((GameFlags and gfInfAttack) <> 0) and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttackingInInfAttackMode <> 0)) |
450 and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then |
451 and (not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0))) then |
451 //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) |
452 //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) |
452 begin |
453 begin |
453 if (cHedgehogTurnTime >= 10000) |
454 if (cHedgehogTurnTime >= 10000) |
454 and (not PlacingHogs) |
455 and (not PlacingHogs) |