From: nethack.rankin <nethack.rankin>
Date: Sat, 9 Nov 2002 05:36:13 +0000 (+0000)
Subject: fix up some unused code
X-Git-Tag: MOVE2GIT~2337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ca589adc0cf790c7e9fa3a40e5c5e78385f7ece;p=nethack

fix up some unused code
---

diff --git a/src/worn.c b/src/worn.c
index 1078d9a9e..d2afdc86d 100644
--- a/src/worn.c
+++ b/src/worn.c
@@ -535,16 +535,13 @@ clear_bypasses()
 		   have been transformed and won't be stacked in the usual
 		   manner afterwards; so don't bother with this */
 #if 0
-		if (otmp->where == OBJ_FLOOR) {
-		    struct obj *obj;
+		if (objects[otmp->otyp].oc_merge) {
 		    xchar ox, oy;
 
 		    (void) get_obj_location(otmp, &ox, &oy, 0);
 		    obj_extract_self(otmp);
-		    obj = merge_choice(level.objects[ox][oy], otmp);
-		    /* if it doesn't merge then place it back */
-		    if (!obj || !merged(&obj, &otmp))
-		        place_object(otmp, ox, oy);
+		    place_object(otmp, ox, oy);
+		    stack_object(otmp);
 		    newsym(ox, oy);
 		}
 #endif	/*0*/