setuwep, et al, cleanup

src/apply.c

@@ -2015,7 +2015,6 @@ struct obj *obj;
     } else if ((Fumbling || Glib) && !rn2(5)) {
 	pline_The("bullwhip slips out of your %s.", body_part(HAND));
 	dropx(obj);
-	setuwep((struct obj *)0);
 
     } else if (u.utrap && u.utraptype == TT_PIT) {
 	/*

src/ball.c

@@ -641,9 +641,7 @@ litter()
 	while (otmp) {
 		nextobj = otmp->nobj;
 		if ((otmp != uball) && (rnd(capacity) <= (int)otmp->owt)) {
-			if (otmp == uwep)
+			if (canletgo(otmp, "")) {
-				setuwep((struct obj *)0);
-			if ((otmp != uwep) && (canletgo(otmp, ""))) {
 				Your("%s you down the stairs.",
 				     aobjnam(otmp, "follow"));
 				dropx(otmp);

src/dig.c

@@ -224,7 +224,6 @@ dig()
 		case 0:  if(!welded(uwep)) {
 			     You("fumble and drop your %s.", xname(uwep));
 			     dropx(uwep);
-			     setuwep((struct obj *)0);
 			 } else {
 #ifdef STEED
 			     if (u.usteed)

src/do.c

@@ -456,7 +456,6 @@ register struct obj *obj;
 			return(0);
 		}
 		setuwep((struct obj *)0);
-		if(uwep) return 0; /* lifesaved and rewielded */
 	}
 	if(obj == uquiver) {
 		setuqwep((struct obj *)0);

src/do_wear.c

@@ -635,10 +635,9 @@ register struct obj *obj;
     long oldprop = u.uprops[objects[obj->otyp].oc_oprop].extrinsic;
     int old_attrib;
 
-
+    if (obj == uwep) setuwep((struct obj *) 0);
-	if (obj == uwep) setuwep((struct obj *) 0);
+    if (obj == uswapwep) setuswapwep((struct obj *) 0);
-	if (obj == uswapwep) setuswapwep((struct obj *) 0);
+    if (obj == uquiver) setuqwep((struct obj *) 0);
-	if (obj == uquiver) setuqwep((struct obj *) 0);
 
     /* only mask out W_RING when we don't have both
        left and right rings of the same type */
@@ -1417,6 +1416,10 @@ doputon()
 	}
 	if(otmp == uwep)
 		setuwep((struct obj *)0);
+	if(otmp == uswapwep)
+		setuswapwep((struct obj *) 0);
+	if(otmp == uquiver)
+		setuqwep((struct obj *) 0);
 	if(otmp->oclass == RING_CLASS || otmp->otyp == MEAT_RING) {
 		if(nolimbs(youmonst.data)) {
 			You("cannot make the ring stick to your body.");

src/wield.c

@@ -84,11 +84,6 @@ STATIC_DCL int FDECL(ready_weapon, (struct obj *));
  * 5.  Emptying the slot, by passing a null object.  NEVER pass
  *     zeroobj!
  *
- * Note: setuwep() with a null obj, and uwepgone(), are NOT the same!
- * Sometimes unwielding a weapon can kill you, and lifesaving will then
- * put it back into your hand.  If lifesaving is permitted to do this,
- * use setwuep((struct obj *)0); otherwise use uwepgone().
- *
  * If the item is being moved from another slot, it is the caller's
  * responsibility to handle that.  It's also the caller's responsibility
  * to print the appropriate messages.
@@ -443,7 +438,6 @@ can_twoweapon()
 		Your("%s from your %s!",  aobjnam(obj, "slip"), str);
 		if (!Glib)
 			obj->bknown = TRUE;
-		setuswapwep((struct obj *) 0);
 		dropx(obj);
 	} else
 		return (TRUE);