diff -r 51ebab1b446d -r f67c603c23b5 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Fri Oct 16 18:56:08 2009 +0000 +++ b/hedgewars/HHHandlers.inc Fri Oct 16 19:52:09 2009 +0000 @@ -234,6 +234,7 @@ end; procedure AfterAttack; +var s: shortstring; begin with CurrentHedgehog^.Gear^, CurrentHedgehog^ do @@ -242,10 +243,20 @@ if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then begin Inc(AttacksNum); + if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) then - AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate); - isInMultiShoot:= (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or - ((GameFlags and gfMultiWeapon) <> 0) + begin + s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - AttacksNum); + AddCaption(format(trmsg[sidRemaining], s), + $FFFFFF, + capgrpAmmostate); + end; + + if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or + ((GameFlags and gfMultiWeapon) <> 0) then + begin + isInMultiShoot:= true + end else begin TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; @@ -762,4 +773,4 @@ if Team^.hasGone then TeamGoneEffect(Team^); doStepHedgehogDriven(Gear) end; -end; +end; \ No newline at end of file