From c1a3682952ccdfafcdde464ef4342820b31aebad Mon Sep 17 00:00:00 2001 From: cohrs Date: Tue, 12 Feb 2002 05:42:08 +0000 Subject: [PATCH] "The" Invocation items in farewell message followup use and export the_unique_obj() for the test, to ensure consistency --- include/extern.h | 1 + src/end.c | 2 +- src/objnam.c | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/extern.h b/include/extern.h index 5153ef252..4841e0527 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1307,6 +1307,7 @@ E boolean FDECL(obj_is_pname, (struct obj *)); E char *FDECL(distant_name, (struct obj *,char *(*)(OBJ_P))); E char *FDECL(xname, (struct obj *)); E char *FDECL(mshot_xname, (struct obj *)); +E boolean FDECL(the_unique_obj, (struct obj *obj)); E char *FDECL(doname, (struct obj *)); E boolean FDECL(not_fully_identified, (struct obj *)); E char *FDECL(corpse_xname, (struct obj *,BOOLEAN_P)); diff --git a/src/end.c b/src/end.c index 282ce827f..eb226fd74 100644 --- a/src/end.c +++ b/src/end.c @@ -495,7 +495,7 @@ winid endwin; otmp->rknown = 1; /* assumes artifacts don't have quan>1 */ Sprintf(pbuf, "%s%s (worth %ld %s and %ld points)", - !otmp->oartifact ? "The " : "", + the_unique_obj(otmp) ? "The " : "", otmp->oartifact ? artifact_name(xname(otmp), &dummy) : OBJ_NAME(objects[otmp->otyp]), arti_cost(otmp), currency(2L), diff --git a/src/objnam.c b/src/objnam.c index af54aefff..f34ed3dc4 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -10,9 +10,6 @@ #define NUMOBUF 12 STATIC_DCL char *FDECL(strprepend,(char *,const char *)); -#ifdef OVL0 -static boolean FDECL(the_unique_obj, (struct obj *obj)); -#endif #ifdef OVLB static boolean FDECL(wishymatch, (const char *,const char *,BOOLEAN_P)); #endif @@ -491,7 +488,7 @@ struct obj *obj; #ifdef OVL0 /* used for naming "the unique_item" instead of "a unique_item" */ -static boolean +boolean the_unique_obj(obj) register struct obj *obj; {