Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authornemo
Wed, 06 Oct 2010 20:21:20 -0400
changeset 3934 8cdbc0505f18
parent 3931 fd04228971b3 (diff)
parent 3932 2fc211f60015 (current diff)
child 3936 0b982d340633
merge
--- 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
hedgewars