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

remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core

Browse Source
This commit is contained in:
nhmall
2019-07-14 17:24:58 -04:00
parent e3b5e7f95a
commit 0d34f43830
96 changed files with 2339 additions and 2370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/invent.c
View File

@@ -13,31 +13,31 @@
#define CONTAINED_SYM '>' /* designator for inside a container */
#define HANDS_SYM '-'
STATIC_DCL void FDECL(loot_classify, (Loot *, struct obj *));
STATIC_DCL char *FDECL(loot_xname, (struct obj *));
STATIC_DCL int FDECL(CFDECLSPEC sortloot_cmp, (const genericptr,
static void FDECL(loot_classify, (Loot *, struct obj *));
static char *FDECL(loot_xname, (struct obj *));
static int FDECL(CFDECLSPEC sortloot_cmp, (const genericptr,
const genericptr));
STATIC_DCL void NDECL(reorder_invent);
STATIC_DCL void FDECL(noarmor, (BOOLEAN_P));
STATIC_DCL void FDECL(invdisp_nothing, (const char *, const char *));
STATIC_DCL boolean FDECL(worn_wield_only, (struct obj *));
STATIC_DCL boolean FDECL(only_here, (struct obj *));
STATIC_DCL void FDECL(compactify, (char *));
STATIC_DCL boolean FDECL(taking_off, (const char *));
STATIC_DCL boolean FDECL(putting_on, (const char *));
STATIC_PTR int FDECL(ckvalidcat, (struct obj *));
STATIC_PTR int FDECL(ckunpaid, (struct obj *));
STATIC_PTR char *FDECL(safeq_xprname, (struct obj *));
STATIC_PTR char *FDECL(safeq_shortxprname, (struct obj *));
STATIC_DCL char FDECL(display_pickinv, (const char *, const char *,
static void NDECL(reorder_invent);
static void FDECL(noarmor, (BOOLEAN_P));
static void FDECL(invdisp_nothing, (const char *, const char *));
static boolean FDECL(worn_wield_only, (struct obj *));
static boolean FDECL(only_here, (struct obj *));
static void FDECL(compactify, (char *));
static boolean FDECL(taking_off, (const char *));
static boolean FDECL(putting_on, (const char *));
static int FDECL(ckvalidcat, (struct obj *));
static int FDECL(ckunpaid, (struct obj *));
static char *FDECL(safeq_xprname, (struct obj *));
static char *FDECL(safeq_shortxprname, (struct obj *));
static char FDECL(display_pickinv, (const char *, const char *,
const char *, BOOLEAN_P, long *));
STATIC_DCL char FDECL(display_used_invlets, (CHAR_P));
STATIC_DCL boolean FDECL(this_type_only, (struct obj *));
STATIC_DCL void NDECL(dounpaid);
STATIC_DCL struct obj *FDECL(find_unpaid, (struct obj *, struct obj **));
STATIC_DCL void FDECL(menu_identify, (int));
STATIC_DCL boolean FDECL(tool_in_use, (struct obj *));
STATIC_DCL char FDECL(obj_to_let, (struct obj *));
static char FDECL(display_used_invlets, (CHAR_P));
static boolean FDECL(this_type_only, (struct obj *));
static void NDECL(dounpaid);
static struct obj *FDECL(find_unpaid, (struct obj *, struct obj **));
static void FDECL(menu_identify, (int));
static boolean FDECL(tool_in_use, (struct obj *));
static char FDECL(obj_to_let, (struct obj *));
/* wizards can wish for venom, which will become an invisible inventory
* item without this. putting it in inv_order would mean venom would
@@ -51,7 +51,7 @@ STATIC_DCL char FDECL(obj_to_let, (struct obj *));
static const char venom_inv[] = { VENOM_CLASS, 0 }; /* (constant) */
/* sortloot() classification; called at most once [per sort] for each object */
STATIC_OVL void
static void
loot_classify(sort_item, obj)
Loot *sort_item;
struct obj *obj;
@@ -209,7 +209,7 @@ struct obj *obj;
}
/* sortloot() formatting routine; for alphabetizing, not shown to user */
STATIC_OVL char *
static char *
loot_xname(obj)
struct obj *obj;
{
@@ -293,7 +293,7 @@ struct obj *obj;
}
/* qsort comparison routine for sortloot() */
STATIC_OVL int CFDECLSPEC
static int CFDECLSPEC
sortloot_cmp(vptr1, vptr2)
const genericptr vptr1;
const genericptr vptr2;
@@ -620,7 +620,7 @@ register struct obj *otmp;
#define inv_rank(o) ((o)->invlet ^ 040)
/* sort the inventory; used by addinv() and doorganize() */
STATIC_OVL void
static void
reorder_invent()
{
struct obj *otmp, *prev, *next;
@@ -1344,7 +1344,7 @@ register int x, y;
}
/* compact a string of inventory letters by dashing runs of letters */
STATIC_OVL void
static void
compactify(buf)
register char *buf;
{
@@ -1391,7 +1391,7 @@ struct obj *obj;
}
/* match the prompt for either 'T' or 'R' command */
STATIC_OVL boolean
static boolean
taking_off(action)
const char *action;
{
@@ -1399,7 +1399,7 @@ const char *action;
}
/* match the prompt for either 'W' or 'P' command */
STATIC_OVL boolean
static boolean
putting_on(action)
const char *action;
{
@@ -1856,7 +1856,7 @@ struct obj *otmp;
pline(silly_thing_to, word);
}
STATIC_PTR int
static int
ckvalidcat(otmp)
struct obj *otmp;
{
@@ -1864,7 +1864,7 @@ struct obj *otmp;
return (int) allow_category(otmp);
}
STATIC_PTR int
static int
ckunpaid(otmp)
struct obj *otmp;
{
@@ -1888,13 +1888,13 @@ struct obj *otmp;
}
/* extra xprname() input that askchain() can't pass through safe_qbuf() */
STATIC_VAR struct xprnctx {
static struct xprnctx {
char let;
boolean dot;
} safeq_xprn_ctx;
/* safe_qbuf() -> short_oname() callback */
STATIC_PTR char *
static char *
safeq_xprname(obj)
struct obj *obj;
{
@@ -1903,7 +1903,7 @@ struct obj *obj;
}
/* alternate safe_qbuf() -> short_oname() callback */
STATIC_PTR char *
static char *
safeq_shortxprname(obj)
struct obj *obj;
{
@@ -2281,7 +2281,7 @@ struct obj *otmp;
}
/* menu of unidentified objects; select and identify up to id_limit of them */
STATIC_OVL void
static void
menu_identify(id_limit)
int id_limit;
{
@@ -2394,7 +2394,7 @@ learn_unseen_invent()
}
/* should of course only be called for things in invent */
STATIC_OVL char
static char
obj_to_let(obj)
struct obj *obj;
{
@@ -2484,7 +2484,7 @@ ddoinv()
* next unpaid object is returned. This routine recursively follows
* containers.
*/
STATIC_OVL struct obj *
static struct obj *
find_unpaid(list, last_found)
struct obj *list, **last_found;
{
@@ -2522,7 +2522,7 @@ free_pickinv_cache()
* inventory and return a count as well as a letter. If out_cnt is not null,
* any count returned from the menu selection is placed here.
*/
STATIC_OVL char
static char
display_pickinv(lets, xtra_choice, query, want_reply, out_cnt)
register const char *lets;
const char *xtra_choice; /* "fingers", pick hands rather than an object */
@@ -2774,7 +2774,7 @@ boolean want_reply;
* Show what is current using inventory letters.
*
*/
STATIC_OVL char
static char
display_used_invlets(avoidlet)
char avoidlet;
{
@@ -2959,7 +2959,7 @@ boolean nested, /* include contents of any nested containers */
return count;
}
STATIC_OVL void
static void
dounpaid()
{
winid win;
@@ -3061,7 +3061,7 @@ dounpaid()
}
STATIC_OVL boolean
static boolean
this_type_only(obj)
struct obj *obj;
{
@@ -3701,7 +3701,7 @@ doprwep()
}
/* caller is responsible for checking !wearing_armor() */
STATIC_OVL void
static void
noarmor(report_uskin)
boolean report_uskin;
{
@@ -3790,7 +3790,7 @@ dopramulet()
return 0;
}
STATIC_OVL boolean
static boolean
tool_in_use(obj)
struct obj *obj;
{
@@ -3873,13 +3873,13 @@ long numused;
* Conversion from a class to a string for printing.
* This must match the object class order.
*/
STATIC_VAR NEARDATA const char *names[] = {
static NEARDATA const char *names[] = {
0, "Illegal objects", "Weapons", "Armor", "Rings", "Amulets", "Tools",
"Comestibles", "Potions", "Scrolls", "Spellbooks", "Wands", "Coins",
"Gems/Stones", "Boulders/Statues", "Iron balls", "Chains", "Venoms"
};
STATIC_VAR NEARDATA const char oth_symbols[] = { CONTAINED_SYM, '\0' };
STATIC_VAR NEARDATA const char *oth_names[] = { "Bagged/Boxed items" };
static NEARDATA const char oth_symbols[] = { CONTAINED_SYM, '\0' };
static NEARDATA const char *oth_names[] = { "Bagged/Boxed items" };
char *
let_to_name(let, unpaid, showsym)
@@ -4239,7 +4239,7 @@ doorganize() /* inventory organizer by Del Lamb */
}
/* common to display_minventory and display_cinventory */
STATIC_OVL void
static void
invdisp_nothing(hdr, txt)
const char *hdr, *txt;
{
@@ -4262,7 +4262,7 @@ const char *hdr, *txt;
}
/* query_objlist callback: return things that are worn or wielded */
STATIC_OVL boolean
static boolean
worn_wield_only(obj)
struct obj *obj;
{
@@ -4375,7 +4375,7 @@ register struct obj *obj;
}
STATIC_OVL boolean
static boolean
only_here(obj)
struct obj *obj;
{