equal
deleted
inserted
replaced
377 end |
377 end |
378 else |
378 else |
379 begin |
379 begin |
380 OnUsedAmmo(CurrentHedgehog^); |
380 OnUsedAmmo(CurrentHedgehog^); |
381 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and ((GameFlags and gfInfAttack) = 0) then |
381 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and ((GameFlags and gfInfAttack) = 0) then |
|
382 begin |
|
383 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; |
382 TurnTimeLeft:= Ammoz[a].TimeAfterTurn; |
384 TurnTimeLeft:= Ammoz[a].TimeAfterTurn; |
|
385 end; |
383 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked; |
386 if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) then State:= State or gstAttacked; |
384 if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^) |
387 if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then ApplyAmmoChanges(CurrentHedgehog^) |
385 end; |
388 end; |
386 end |
389 end |
387 else |
390 else |
791 else |
794 else |
792 HHGear^.Message:= 0; |
795 HHGear^.Message:= 0; |
793 |
796 |
794 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then |
797 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then |
795 begin |
798 begin |
|
799 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; |
796 TurnTimeLeft:= 0; |
800 TurnTimeLeft:= 0; |
797 isCursorVisible:= false; |
801 isCursorVisible:= false; |
798 HHGear^.State:= HHGear^.State and not (gstHHDriven or gstAnimation or gstAttacking); |
802 HHGear^.State:= HHGear^.State and not (gstHHDriven or gstAnimation or gstAttacking); |
799 AttackBar:= 0; |
803 AttackBar:= 0; |
800 if HHGear^.Damage > 0 then |
804 if HHGear^.Damage > 0 then |