nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

"The" Invocation items in farewell message followup

Browse Source 
use and export the_unique_obj() for the test, to ensure consistency
This commit is contained in:
cohrs
2002-02-12 05:42:08 +00:00
parent bd3c76815d
commit c1a3682952
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -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(distant_name, (struct obj *,char *(*)(OBJ_P)));
E char *FDECL(xname, (struct obj *)); E char *FDECL(xname, (struct obj *));
E char *FDECL(mshot_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 char *FDECL(doname, (struct obj *));
E boolean FDECL(not_fully_identified, (struct obj *)); E boolean FDECL(not_fully_identified, (struct obj *));
E char *FDECL(corpse_xname, (struct obj *,BOOLEAN_P)); E char *FDECL(corpse_xname, (struct obj *,BOOLEAN_P));

2
src/end.c
View File

@@ -495,7 +495,7 @@ winid endwin;
otmp->rknown = 1; otmp->rknown = 1;
/* assumes artifacts don't have quan>1 */ /* assumes artifacts don't have quan>1 */
Sprintf(pbuf, "%s%s (worth %ld %s and %ld points)", 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) : otmp->oartifact ? artifact_name(xname(otmp), &dummy) :
OBJ_NAME(objects[otmp->otyp]), OBJ_NAME(objects[otmp->otyp]),
arti_cost(otmp), currency(2L), arti_cost(otmp), currency(2L),

5
src/objnam.c
View File

@@ -10,9 +10,6 @@
#define NUMOBUF 12 #define NUMOBUF 12
STATIC_DCL char *FDECL(strprepend,(char *,const char *)); STATIC_DCL char *FDECL(strprepend,(char *,const char *));
#ifdef OVL0
static boolean FDECL(the_unique_obj, (struct obj *obj));
#endif
#ifdef OVLB #ifdef OVLB
static boolean FDECL(wishymatch, (const char *,const char *,BOOLEAN_P)); static boolean FDECL(wishymatch, (const char *,const char *,BOOLEAN_P));
#endif #endif
@@ -491,7 +488,7 @@ struct obj *obj;
#ifdef OVL0 #ifdef OVL0
/* used for naming "the unique_item" instead of "a unique_item" */ /* used for naming "the unique_item" instead of "a unique_item" */
static boolean boolean
the_unique_obj(obj) the_unique_obj(obj)
register struct obj *obj; register struct obj *obj;
{ {