hedgewars/uGearsHedgehog.pas
changeset 12654 2837dee472cc
parent 12605 ef780eda6e48
child 12820 92218a06c9ff
equal deleted inserted replaced
12653:c755afd8fb6b 12654:2837dee472cc
   574                 else TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100;
   574                 else TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100;
   575                 IsGetAwayTime := true;
   575                 IsGetAwayTime := true;
   576                 end;
   576                 end;
   577             if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (HHGear <> nil) then
   577             if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (HHGear <> nil) then
   578                 HHGear^.State:= HHGear^.State or gstAttacked;
   578                 HHGear^.State:= HHGear^.State or gstAttacked;
   579             if (Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then
   579             if (a = amNothing) or ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) or
       
   580                (((GameFlags and gfInfAttack) <> 0) and ((Ammoz[a].Ammo.Propz and ammoprop_ForceTurnEnd) = 0)) then
   580                 ApplyAmmoChanges(CurrentHedgehog^)
   581                 ApplyAmmoChanges(CurrentHedgehog^)
   581             end;
   582             end;
   582         end
   583         end
   583     else
   584     else
   584         begin
   585         begin