Unify iron ball unwielding

2015-04-22 08:53:13 +03:00
parent 34d5a4c1f9
commit 3bf2d17e2c
3 changed files with 21 additions and 21 deletions
--- a/src/do.c
+++ b/src/do.c
@@ -1282,16 +1282,8 @@ boolean at_stairs, falling, portal;
            Punished || Fumbling) {
            You("fall down the %s.", at_ladder ? "ladder" : "stairs");
            if (Punished) {
-            drag_down();
-            if (carried(uball)) {
-                if (uwep == uball)
-                setuwep((struct obj *)0);
-                if (uswapwep == uball)
-                setuswapwep((struct obj *)0);
-                if (uquiver == uball)
-                setuqwep((struct obj *)0);
-                freeinv(uball);
-            }
+		drag_down();
+		ballrelease(FALSE);
            }
            /* falling off steed has its own losehp() call */
            if (u.usteed)