--- a/hedgewars/CCHandlers.inc	Sat Sep 23 19:26:07 2006 +0000
+++ b/hedgewars/CCHandlers.inc	Sun Sep 24 18:29:14 2006 +0000
@@ -306,7 +306,6 @@
                 caSlot^:= slot;
                 caAmmo^:= 0;
                 end;
-          TargetPoint.X:= NoPointX;
           end;
      ApplyAmmoChanges(Hedgehogs[CurrHedgehog])
      end
@@ -315,6 +314,11 @@
 procedure chPut(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
+if bShowAmmoMenu then
+   begin
+   bSelected:= true;
+   exit
+   end;
 with CurrentTeam.Hedgehogs[CurrentTeam.CurrHedgehog].Gear^ do
      if (State and gstHHChooseTarget) <> 0 then
         begin
@@ -375,6 +379,7 @@
 with CurrentTeam^ do
      with Hedgehogs[CurrHedgehog] do
           begin
+          bSelected:= false;
           if bShowAmmoMenu then bShowAmmoMenu:= false
           else if ((Gear.State and (gstAttacking or gstAttacked)) <> 0) or (AttacksNum > 0)
                or ((Gear.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true