# HG changeset patch # User nemo # Date 1286410880 14400 # Node ID 8cdbc0505f1850a7093306ef5e9ffa73bfc8ebbb # Parent fd04228971b32dfb46652aa297a388504c8dfc67# Parent 2fc211f600159d4a1a67b4d24d536692e05da331 merge diff -r 2fc211f60015 -r 8cdbc0505f18 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Wed Oct 06 22:36:41 2010 +0200 +++ b/hedgewars/uAmmos.pas Wed Oct 06 20:21:20 2010 -0400 @@ -243,7 +243,8 @@ if Count = 0 then begin PackAmmo(Ammo, Ammoz[AmmoType].Slot); - SwitchNotHeldAmmo(Hedgehog) + //SwitchNotHeldAmmo(Hedgehog); + CurAmmoType:= amNothing end end end