From 857a46c2956f4cf4356f1cde311f275aac18f720 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Sat, 15 Apr 2006 15:49:00 +0000 Subject: [PATCH] another safe_oname() bit (trunk only) --- src/invent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/invent.c b/src/invent.c index 6acf4212f..74e8da1fd 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)invent.c 3.5 2006/04/14 */ +/* SCCS Id: @(#)invent.c 3.5 2006/04/15 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2452,8 +2452,8 @@ mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */ return FALSE; /* if they have names, make sure they're the same */ - if (has_oname(obj)) objnamelth = strlen(ONAME(obj)); - if (has_oname(otmp)) otmpnamelth = strlen(ONAME(otmp)); + objnamelth = strlen(safe_oname(obj)); + otmpnamelth = strlen(safe_oname(otmp)); if ( (objnamelth != otmpnamelth && ((objnamelth && otmpnamelth) || obj->otyp == CORPSE) ) || -- 2.50.1