equal
deleted
inserted
replaced
418 end |
418 end |
419 end; |
419 end; |
420 |
420 |
421 if TurnTimeLeft > 0 then |
421 if TurnTimeLeft > 0 then |
422 if CurrentHedgehog^.Gear <> nil then |
422 if CurrentHedgehog^.Gear <> nil then |
423 if ((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) and |
423 if (((CurrentHedgehog^.Gear^.State and gstAttacking) = 0) |
424 not(isInMultiShoot and (CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])) then |
424 or ((CurAmmoGear = nil) or ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerWhileAttacking) <> 0))) |
|
425 and not(isInMultiShoot and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_DoesntStopTimerInMultiShoot) <> 0)) then |
|
426 //(CurrentHedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) |
425 begin |
427 begin |
426 if (TurnTimeLeft = 5000) |
428 if (TurnTimeLeft = 5000) |
427 and (cHedgehogTurnTime >= 10000) |
429 and (cHedgehogTurnTime >= 10000) |
428 and (not PlacingHogs) |
430 and (not PlacingHogs) |
429 and (CurrentHedgehog^.Gear <> nil) |
431 and (CurrentHedgehog^.Gear <> nil) |