hedgewars/HHHandlers.inc
changeset 2608 cebfea02f8b5
parent 2603 abed6070a669
child 2619 bc2786a00fb8
--- a/hedgewars/HHHandlers.inc	Mon Nov 09 18:44:09 2009 +0000
+++ b/hedgewars/HHHandlers.inc	Mon Nov 09 20:29:21 2009 +0000
@@ -27,7 +27,7 @@
 	Gear^.Message:= Gear^.Message and not gm_Slot;
 
 	if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0)
-		or (AttacksNum > 0)
+		or (MultiShootAttacks > 0)
 		or ((Gear^.State and gstHHDriven) = 0) then exit;
 
 	Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump);
@@ -242,18 +242,18 @@
 	State:= State and not gstAttacking;
 	if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then
 		begin
-		Inc(AttacksNum);
+		Inc(MultiShootAttacks);
 		
-		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) then
+		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) then
 			begin
-			s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - AttacksNum);
+			s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - MultiShootAttacks);
 			AddCaption(format(trmsg[sidRemaining], s),
 				$FFFFFF,
 				capgrpAmmostate);
 			end;
-				
-		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or
-		((GameFlags and gfMultiWeapon) <> 0) then
+		
+		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) or
+			((GameFlags and gfMultiWeapon) <> 0) then
 			begin
 			isInMultiShoot:= true
 			end
@@ -265,10 +265,10 @@
 			end;
 		end
 	else
-	begin
-	OnUsedAmmo(CurrentHedgehog^);
-	ApplyAmmoChanges(CurrentHedgehog^);
-	end;
+		begin
+		OnUsedAmmo(CurrentHedgehog^);
+		ApplyAmmoChanges(CurrentHedgehog^);
+		end;
 	AttackBar:= 0;
 	end
 end;