fix B14021 - inconsistent menu styles

Menu styles `partial' and `full' will let you remove any type of
item from the three weapon slots via the 'A' command, but `traditional'
and `combination' would only do that for the primary weapon slot.  For
the alternate weapon and quiver slots, the item in question had to be
one which can normally be wielded or worn, otherwise when choosing the
object class letter you'd be told that it was "Not applicable."  And
for wearable items, you needed to be really wearing one of that class
(besides the quivered one) or else you'd get "not wearing any amulet"
or similar.
This commit is contained in:
nethack.rankin
2002-12-14 11:53:22 +00:00
parent 5fcbf50f2c
commit 137bd330e4
4 changed files with 35 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)hacklib.c 3.4 1999/04/10 */
/* SCCS Id: @(#)hacklib.c 3.4 2002/12/13 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) Robert Patrick Rankin, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -18,6 +18,7 @@ NetHack, except that rounddiv may call panic().
char * upstart (char *)
char * mungspaces (char *)
char * eos (char *)
char * strkitten (char *,char)
char * s_suffix (const char *)
char * xcrypt (const char *, char *)
boolean onlyspace (const char *)
@@ -130,6 +131,19 @@ eos(s) /* return the end of a string (pointing at '\0') */
return s;
}
/* strcat(s, {c,'\0'}); */
char *
strkitten(s, c) /* append a character to a string (in place) */
char *s;
char c;
{
char *p = eos(s);
*p++ = c;
*p = '\0';
return s;
}
char *
s_suffix(s) /* return a name converted to possessive */
const char *s;