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

64
src/mon.c
View File

@@ -12,23 +12,23 @@
#include "mfndpos.h"
#include <ctype.h>
STATIC_DCL void FDECL(sanity_check_single_mon, (struct monst *, BOOLEAN_P,
static void FDECL(sanity_check_single_mon, (struct monst *, BOOLEAN_P,
const char *));
STATIC_DCL boolean FDECL(restrap, (struct monst *));
STATIC_DCL long FDECL(mm_aggression, (struct monst *, struct monst *));
STATIC_DCL long FDECL(mm_displacement, (struct monst *, struct monst *));
STATIC_DCL int NDECL(pick_animal);
STATIC_DCL void FDECL(kill_eggs, (struct obj *));
STATIC_DCL int FDECL(pickvampshape, (struct monst *));
STATIC_DCL boolean FDECL(isspecmon, (struct monst *));
STATIC_DCL boolean FDECL(validspecmon, (struct monst *, int));
STATIC_DCL struct permonst *FDECL(accept_newcham_form, (struct monst *, int));
STATIC_DCL struct obj *FDECL(make_corpse, (struct monst *, unsigned));
STATIC_DCL void FDECL(m_detach, (struct monst *, struct permonst *));
STATIC_DCL void FDECL(lifesaved_monster, (struct monst *));
STATIC_DCL void FDECL(migrate_mon, (struct monst *, XCHAR_P, XCHAR_P));
STATIC_DCL boolean FDECL(ok_to_obliterate, (struct monst *));
STATIC_DCL void FDECL(deal_with_overcrowding, (struct monst *));
static boolean FDECL(restrap, (struct monst *));
static long FDECL(mm_aggression, (struct monst *, struct monst *));
static long FDECL(mm_displacement, (struct monst *, struct monst *));
static int NDECL(pick_animal);
static void FDECL(kill_eggs, (struct obj *));
static int FDECL(pickvampshape, (struct monst *));
static boolean FDECL(isspecmon, (struct monst *));
static boolean FDECL(validspecmon, (struct monst *, int));
static struct permonst *FDECL(accept_newcham_form, (struct monst *, int));
static struct obj *FDECL(make_corpse, (struct monst *, unsigned));
static void FDECL(m_detach, (struct monst *, struct permonst *));
static void FDECL(lifesaved_monster, (struct monst *));
static void FDECL(migrate_mon, (struct monst *, XCHAR_P, XCHAR_P));
static boolean FDECL(ok_to_obliterate, (struct monst *));
static void FDECL(deal_with_overcrowding, (struct monst *));
/* note: duplicated in dog.c */
#define LEVEL_SPECIFIC_NOCORPSE(mdat) \
@@ -43,7 +43,7 @@ const char *warnings[] = {
#endif /* 0 */
STATIC_OVL void
static void
sanity_check_single_mon(mtmp, chk_geno, msg)
struct monst *mtmp;
boolean chk_geno;
@@ -291,7 +291,7 @@ int mndx;
* G_NOCORPSE set in order to prevent wishing for one, finding tins of one,
* etc....
*/
STATIC_OVL struct obj *
static struct obj *
make_corpse(mtmp, corpseflags)
register struct monst *mtmp;
unsigned corpseflags;
@@ -1550,7 +1550,7 @@ nexttry: /* eels prefer the water, but if there is no water nearby,
in the absence of Conflict. There is no provision for targetting
other monsters; just hand to hand fighting when they happen to be
next to each other. */
STATIC_OVL long
static long
mm_aggression(magr, mdef)
struct monst *magr, /* monster that is currently deciding where to move */
*mdef; /* another monster which is next to it */
@@ -1567,7 +1567,7 @@ struct monst *magr, /* monster that is currently deciding where to move */
}
/* Monster displacing another monster out of the way */
STATIC_OVL long
static long
mm_displacement(magr, mdef)
struct monst *magr, /* monster that is currently deciding where to move */
*mdef; /* another monster which is next to it */
@@ -1816,7 +1816,7 @@ struct monst *mon;
}
/* remove effects of mtmp from other data structures */
STATIC_OVL void
static void
m_detach(mtmp, mptr)
struct monst *mtmp;
struct permonst *mptr; /* reflects mtmp->data _prior_ to mtmp's death */
@@ -1872,7 +1872,7 @@ struct monst *mon;
return (struct obj *) 0;
}
STATIC_OVL void
static void
lifesaved_monster(mtmp)
struct monst *mtmp;
{
@@ -2601,7 +2601,7 @@ struct monst *mtmp;
migrate_mon(mtmp, target_lev, xyloc);
}
STATIC_OVL void
static void
migrate_mon(mtmp, target_lev, xyloc)
struct monst *mtmp;
xchar target_lev, xyloc;
@@ -2612,7 +2612,7 @@ xchar target_lev, xyloc;
mtmp->mstate |= MON_MIGRATING;
}
STATIC_OVL boolean
static boolean
ok_to_obliterate(mtmp)
struct monst *mtmp;
{
@@ -2733,7 +2733,7 @@ struct monst *mtmp;
return;
}
STATIC_OVL void
static void
deal_with_overcrowding(mtmp)
struct monst *mtmp;
{
@@ -3150,7 +3150,7 @@ struct monst *mon;
}
/* unwatched hiders may hide again; if so, returns True */
STATIC_OVL boolean
static boolean
restrap(mtmp)
register struct monst *mtmp;
{
@@ -3260,7 +3260,7 @@ boolean construct;
}
}
STATIC_OVL int
static int
pick_animal()
{
int res;
@@ -3339,7 +3339,7 @@ int shiftflags;
}
}
STATIC_OVL int
static int
pickvampshape(mon)
struct monst *mon;
{
@@ -3369,7 +3369,7 @@ struct monst *mon;
}
/* nonshapechangers who warrant special polymorph handling */
STATIC_OVL boolean
static boolean
isspecmon(mon)
struct monst *mon;
{
@@ -3380,7 +3380,7 @@ struct monst *mon;
/* restrict certain special monsters (shopkeepers, aligned priests,
vault guards) to forms that allow them to behave sensibly (catching
gold, speaking?) so that they don't need too much extra code */
STATIC_OVL boolean
static boolean
validspecmon(mon, mndx)
struct monst *mon;
int mndx;
@@ -3603,7 +3603,7 @@ struct monst *mon;
}
/* this used to be inline within newcham() but monpolycontrol needs it too */
STATIC_OVL struct permonst *
static struct permonst *
accept_newcham_form(mon, mndx)
struct monst *mon;
int mndx;
@@ -3946,7 +3946,7 @@ boolean egg;
}
/* kill off any eggs of genocided monsters */
STATIC_OVL void
static void
kill_eggs(obj_list)
struct obj *obj_list;
{