From: nethack.allison <nethack.allison>
Date: Sat, 15 Apr 2006 15:49:00 +0000 (+0000)
Subject: another safe_oname() bit (trunk only)
X-Git-Tag: MOVE2GIT~1058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=857a46c2956f4cf4356f1cde311f275aac18f720;p=nethack

another safe_oname() bit (trunk only)
---

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)
 	     ) ||