Unify iron ball unwielding

include/extern.h

@@ -119,6 +119,7 @@ E void FDECL(uchangealign, (int,int));
 
 /* ### ball.c ### */
 
+E void FDECL(ballrelease, (boolean));
 E void NDECL(ballfall);
 E void NDECL(placebc);
 E void NDECL(unplacebc);

src/ball.c

@@ -11,14 +11,11 @@ STATIC_DCL int NDECL(bc_order);
 STATIC_DCL void NDECL(litter);
 
 void
-ballfall()
+ballrelease(showmsg)
+boolean showmsg;
 {
-	boolean gets_hit;
-
-	gets_hit = (((uball->ox != u.ux) || (uball->oy != u.uy)) &&
-		    ((uwep == uball)? FALSE : (boolean)rn2(5)));
     if (carried(uball)) {
-		pline("Startled, you drop the iron ball.");
+	if (showmsg) pline("Startled, you drop the iron ball.");
 	if (uwep == uball)
 	    setuwep((struct obj *)0);
 	if (uswapwep == uball)
@@ -28,6 +25,16 @@ ballfall()
 	if (uwep != uball)
 	    freeinv(uball);
     }
+}
+
+void
+ballfall()
+{
+	boolean gets_hit;
+
+	gets_hit = (((uball->ox != u.ux) || (uball->oy != u.uy)) &&
+		    ((uwep == uball)? FALSE : (boolean)rn2(5)));
+	ballrelease(TRUE);
 	if(gets_hit){
 		int dmg = rn1(7,25);
 		pline_The("iron ball falls on your %s.",

src/do.c

@@ -1283,15 +1283,7 @@ boolean at_stairs, falling, portal;
             You("fall down the %s.", at_ladder ? "ladder" : "stairs");
             if (Punished) {
 		drag_down();
-            if (carried(uball)) {
+		ballrelease(FALSE);
-                if (uwep == uball)
-                setuwep((struct obj *)0);
-                if (uswapwep == uball)
-                setuswapwep((struct obj *)0);
-                if (uquiver == uball)
-                setuqwep((struct obj *)0);
-                freeinv(uball);
-            }
             }
             /* falling off steed has its own losehp() call */
             if (u.usteed)