# HG changeset patch
# User unc0rr
# Date 1255722729 0
# Node ID f67c603c23b5fa62c2aaed29fd077ac127ede4c7
# Parent  51ebab1b446d045f24cadb2f2c0132e31ce39b3e
 - Fix build
 - Replace 01:07 'Remaining' with '%1 remaining'

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
diff -r 51ebab1b446d -r f67c603c23b5 share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt	Fri Oct 16 18:56:08 2009 +0000
+++ b/share/hedgewars/Data/Locale/en.txt	Fri Oct 16 19:52:09 2009 +0000
@@ -49,7 +49,7 @@
 01:04=Paused
 01:05=Really quit (Y/Esc)?
 01:06=Sudden Death!
-01:07=Remaining
+01:07=%1 remaining
 01:08=Fuel
 01:09=Synchronizing...
 
diff -r 51ebab1b446d -r f67c603c23b5 share/hedgewars/Data/Locale/ru.txt
--- a/share/hedgewars/Data/Locale/ru.txt	Fri Oct 16 18:56:08 2009 +0000
+++ b/share/hedgewars/Data/Locale/ru.txt	Fri Oct 16 19:52:09 2009 +0000
@@ -49,7 +49,7 @@
 01:04=Пауза
 01:05=Точно выйти (Y/Esc)?
 01:06=Скоро погибель!
-01:07=Ещё
+01:07=Ещё %1
 01:08=Топливо
 01:09=Синхронизация...