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

fix other way to get "silly thing to wear"

Browse Source 
It was possible for the code to end up in do_wear.c
to put out the "silly thing to wear" message.
This commit is contained in:
nethack.allison
2003-01-31 13:19:09 +00:00
parent 02d784f039
commit b7be80ab22
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+1
View File
@@ -807,6 +807,7 @@ E int FDECL(count_unpaid, (struct obj *));
E int FDECL(count_buc, (struct obj *,int)); E int FDECL(count_buc, (struct obj *,int));
E void FDECL(carry_obj_effects, (struct obj *)); E void FDECL(carry_obj_effects, (struct obj *));
E const char *FDECL(currency, (long)); E const char *FDECL(currency, (long));
E void FDECL(silly_thing, (const char *,struct obj *));
/* ### ioctl.c ### */ /* ### ioctl.c ### */
src/do_wear.c
+1 -1
View File
@@ -1296,7 +1296,7 @@ boolean noisy;
/* getobj can't do this after setting its allow_all flag; that /* getobj can't do this after setting its allow_all flag; that
happens if you have armor for slots that are covered up or happens if you have armor for slots that are covered up or
extra armor for slots that are filled */ extra armor for slots that are filled */
if (noisy) pline(silly_thing_to, "wear"); if (noisy) silly_thing("wear", otmp);
err++; err++;
} }
/* Unnecessary since now only weapons and special items like pick-axes get /* Unnecessary since now only weapons and special items like pick-axes get
src/invent.c
+4 -5
View File
@@ -20,7 +20,6 @@ STATIC_DCL boolean FDECL(putting_on, (const char *));
STATIC_PTR int FDECL(ckunpaid,(struct obj *)); STATIC_PTR int FDECL(ckunpaid,(struct obj *));
STATIC_PTR int FDECL(ckvalidcat,(struct obj *)); STATIC_PTR int FDECL(ckvalidcat,(struct obj *));
static char FDECL(display_pickinv, (const char *,BOOLEAN_P, long *)); static char FDECL(display_pickinv, (const char *,BOOLEAN_P, long *));
STATIC_DCL void FDECL(silly_thing, (const char *,const char *,struct obj *));
#ifdef OVLB #ifdef OVLB
STATIC_DCL boolean FDECL(this_type_only, (struct obj *)); STATIC_DCL boolean FDECL(this_type_only, (struct obj *));
STATIC_DCL void NDECL(dounpaid); STATIC_DCL void NDECL(dounpaid);
@@ -1059,7 +1058,7 @@ register const char *let,*word;
&& !(usegold && otmp->oclass == COIN_CLASS) && !(usegold && otmp->oclass == COIN_CLASS)
#endif #endif
) { ) {
silly_thing(let, word, otmp); silly_thing(word, otmp);
return((struct obj *)0); return((struct obj *)0);
} }
if(allowcnt == 2) { /* cnt given */ if(allowcnt == 2) { /* cnt given */
@@ -1078,9 +1077,9 @@ register const char *let,*word;
return(otmp); return(otmp);
} }
STATIC_OVL void void
silly_thing(let, word, otmp) silly_thing(word, otmp)
const char *let, *word; const char *word;
struct obj *otmp; struct obj *otmp;
{ {
int otyp = otmp->otyp; int otyp = otmp->otyp;