fix up some unused code

This commit is contained in:
nethack.rankin
2002-11-09 05:36:13 +00:00
parent e639c09f58
commit 1ca589adc0

View File

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