# HG changeset patch
# User unc0rr
# Date 1212434153 0
# Node ID d2c49b730771ca5af83076f8826b0d347481ac9d
# Parent  1bd9a4eafbc37c90adca039cff16083f2a95493a
Fix a bug with automatic weapon switching when attacking from rope

diff -r 1bd9a4eafbc3 -r d2c49b730771 hedgewars/uAmmos.pas
--- a/hedgewars/uAmmos.pas	Sun Jun 01 20:01:45 2008 +0000
+++ b/hedgewars/uAmmos.pas	Mon Jun 02 19:15:53 2008 +0000
@@ -138,14 +138,18 @@
 procedure OnUsedAmmo(var Hedgehog: THedgehog);
 begin
 with Hedgehog do
-     begin
-     with Ammo^[CurSlot, CurAmmo] do
-          if Count <> AMMO_INFINITE then
-             begin
-             dec(Count);
-             if Count = 0 then PackAmmo(Ammo, CurSlot)
-             end
-     end
+	begin
+	with Ammo^[CurSlot, CurAmmo] do
+		if Count <> AMMO_INFINITE then
+			begin
+			dec(Count);
+			if Count = 0 then
+				begin
+				PackAmmo(Ammo, CurSlot);
+				SwitchNotHoldedAmmo(Hedgehog)
+				end
+			end
+	end
 end;
 
 function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
diff -r 1bd9a4eafbc3 -r d2c49b730771 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Sun Jun 01 20:01:45 2008 +0000
+++ b/hedgewars/uTeams.pas	Mon Jun 02 19:15:53 2008 +0000
@@ -146,7 +146,6 @@
         AttacksNum:= 0;
         Gear^.Message:= 0;
         Gear^.Z:= cHHZ;
-        SwitchNotHoldedAmmo(CurrentHedgehog^);
         RemoveGearFromList(Gear);
         InsertGearToList(Gear)
         end;