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

110
src/trap.c
View File

@@ -7,43 +7,43 @@
extern const char *const destroy_strings[][3]; /* from zap.c */
STATIC_DCL boolean FDECL(keep_saddle_with_steedcorpse, (unsigned, struct obj *,
static boolean FDECL(keep_saddle_with_steedcorpse, (unsigned, struct obj *,
struct obj *));
STATIC_DCL struct obj *FDECL(t_missile, (int, struct trap *));
STATIC_DCL char *FDECL(trapnote, (struct trap *, BOOLEAN_P));
STATIC_DCL int FDECL(steedintrap, (struct trap *, struct obj *));
STATIC_DCL void FDECL(launch_drop_spot, (struct obj *, XCHAR_P, XCHAR_P));
STATIC_DCL int FDECL(mkroll_launch, (struct trap *, XCHAR_P, XCHAR_P,
static struct obj *FDECL(t_missile, (int, struct trap *));
static char *FDECL(trapnote, (struct trap *, BOOLEAN_P));
static int FDECL(steedintrap, (struct trap *, struct obj *));
static void FDECL(launch_drop_spot, (struct obj *, XCHAR_P, XCHAR_P));
static int FDECL(mkroll_launch, (struct trap *, XCHAR_P, XCHAR_P,
SHORT_P, long));
STATIC_DCL boolean FDECL(isclearpath, (coord *, int, SCHAR_P, SCHAR_P));
STATIC_DCL void FDECL(dofiretrap, (struct obj *));
STATIC_DCL void NDECL(domagictrap);
STATIC_DCL boolean FDECL(emergency_disrobe, (boolean *));
STATIC_DCL int FDECL(untrap_prob, (struct trap *));
STATIC_DCL void FDECL(move_into_trap, (struct trap *));
STATIC_DCL int FDECL(try_disarm, (struct trap *, BOOLEAN_P));
STATIC_DCL void FDECL(reward_untrap, (struct trap *, struct monst *));
STATIC_DCL int FDECL(disarm_holdingtrap, (struct trap *));
STATIC_DCL int FDECL(disarm_landmine, (struct trap *));
STATIC_DCL int FDECL(disarm_squeaky_board, (struct trap *));
STATIC_DCL int FDECL(disarm_shooting_trap, (struct trap *, int));
STATIC_DCL void FDECL(clear_conjoined_pits, (struct trap *));
STATIC_DCL boolean FDECL(adj_nonconjoined_pit, (struct trap *));
STATIC_DCL int FDECL(try_lift, (struct monst *, struct trap *, int,
static boolean FDECL(isclearpath, (coord *, int, SCHAR_P, SCHAR_P));
static void FDECL(dofiretrap, (struct obj *));
static void NDECL(domagictrap);
static boolean FDECL(emergency_disrobe, (boolean *));
static int FDECL(untrap_prob, (struct trap *));
static void FDECL(move_into_trap, (struct trap *));
static int FDECL(try_disarm, (struct trap *, BOOLEAN_P));
static void FDECL(reward_untrap, (struct trap *, struct monst *));
static int FDECL(disarm_holdingtrap, (struct trap *));
static int FDECL(disarm_landmine, (struct trap *));
static int FDECL(disarm_squeaky_board, (struct trap *));
static int FDECL(disarm_shooting_trap, (struct trap *, int));
static void FDECL(clear_conjoined_pits, (struct trap *));
static boolean FDECL(adj_nonconjoined_pit, (struct trap *));
static int FDECL(try_lift, (struct monst *, struct trap *, int,
BOOLEAN_P));
STATIC_DCL int FDECL(help_monster_out, (struct monst *, struct trap *));
static int FDECL(help_monster_out, (struct monst *, struct trap *));
#if 0
STATIC_DCL void FDECL(join_adjacent_pits, (struct trap *));
static void FDECL(join_adjacent_pits, (struct trap *));
#endif
STATIC_DCL boolean FDECL(thitm, (int, struct monst *, struct obj *, int,
static boolean FDECL(thitm, (int, struct monst *, struct obj *, int,
BOOLEAN_P));
STATIC_DCL void NDECL(maybe_finish_sokoban);
static void NDECL(maybe_finish_sokoban);
STATIC_VAR const char *const a_your[2] = { "a", "your" };
STATIC_VAR const char *const A_Your[2] = { "A", "Your" };
STATIC_VAR const char tower_of_flame[] = "tower of flame";
STATIC_VAR const char *const A_gush_of_water_hits = "A gush of water hits";
STATIC_VAR const char *const blindgas[6] = { "humid", "odorless",
static const char *const a_your[2] = { "a", "your" };
static const char *const A_Your[2] = { "A", "Your" };
static const char tower_of_flame[] = "tower of flame";
static const char *const A_gush_of_water_hits = "A gush of water hits";
static const char *const blindgas[6] = { "humid", "odorless",
"pungent", "chilling",
"acrid", "biting" };
@@ -762,7 +762,7 @@ boolean shatter;
return mtmp;
}
STATIC_OVL boolean
static boolean
keep_saddle_with_steedcorpse(steed_mid, objchn, saddle)
unsigned steed_mid;
struct obj *objchn, *saddle;
@@ -838,7 +838,7 @@ struct trap *trap;
}
/* make a single arrow/dart/rock for a trap to shoot or drop */
STATIC_OVL struct obj *
static struct obj *
t_missile(otyp, trap)
int otyp;
struct trap *trap;
@@ -1549,7 +1549,7 @@ unsigned trflags;
}
}
STATIC_OVL char *
static char *
trapnote(trap, noprefix)
struct trap *trap;
boolean noprefix;
@@ -1569,7 +1569,7 @@ boolean noprefix;
return tnbuf;
}
STATIC_OVL int
static int
steedintrap(trap, otmp)
struct trap *trap;
struct obj *otmp;
@@ -1681,7 +1681,7 @@ struct trap *trap;
}
}
STATIC_OVL void
static void
launch_drop_spot(obj, x, y)
struct obj *obj;
xchar x, y;
@@ -2008,7 +2008,7 @@ struct trap *trap;
newsym(trap->tx, trap->ty);
}
STATIC_OVL int
static int
mkroll_launch(ttmp, x, y, otyp, ocount)
struct trap *ttmp;
xchar x, y;
@@ -2078,7 +2078,7 @@ long ocount;
return 1;
}
STATIC_OVL boolean
static boolean
isclearpath(cc, distance, dx, dy)
coord *cc;
int distance;
@@ -3090,7 +3090,7 @@ climb_pit()
}
}
STATIC_OVL void
static void
dofiretrap(box)
struct obj *box; /* null for floor trap */
{
@@ -3160,7 +3160,7 @@ struct obj *box; /* null for floor trap */
melt_ice(u.ux, u.uy, (char *) 0);
}
STATIC_OVL void
static void
domagictrap()
{
register int fate = rnd(20);
@@ -3654,7 +3654,7 @@ boolean here;
* Returns TRUE if disrobing made player unencumbered enough to
* crawl out of the current predicament.
*/
STATIC_OVL boolean
static boolean
emergency_disrobe(lostsome)
boolean *lostsome;
{
@@ -3902,7 +3902,7 @@ dountrap()
}
/* Probability of disabling a trap. Helge Hafting */
STATIC_OVL int
static int
untrap_prob(ttmp)
struct trap *ttmp;
{
@@ -3964,7 +3964,7 @@ boolean bury_it;
}
/* while attempting to disarm an adjacent trap, we've fallen into it */
STATIC_OVL void
static void
move_into_trap(ttmp)
struct trap *ttmp;
{
@@ -4006,7 +4006,7 @@ struct trap *ttmp;
* 1: tries and fails
* 2: succeeds
*/
STATIC_OVL int
static int
try_disarm(ttmp, force_failure)
struct trap *ttmp;
boolean force_failure;
@@ -4091,7 +4091,7 @@ boolean force_failure;
return 2;
}
STATIC_OVL void
static void
reward_untrap(ttmp, mtmp)
struct trap *ttmp;
struct monst *mtmp;
@@ -4113,7 +4113,7 @@ struct monst *mtmp;
}
}
STATIC_OVL int
static int
disarm_holdingtrap(ttmp) /* Helge Hafting */
struct trap *ttmp;
{
@@ -4146,7 +4146,7 @@ struct trap *ttmp;
return 1;
}
STATIC_OVL int
static int
disarm_landmine(ttmp) /* Helge Hafting */
struct trap *ttmp;
{
@@ -4164,7 +4164,7 @@ static NEARDATA const char oil[] = { ALL_CLASSES, TOOL_CLASS, POTION_CLASS,
0 };
/* it may not make much sense to use grease on floor boards, but so what? */
STATIC_OVL int
static int
disarm_squeaky_board(ttmp)
struct trap *ttmp;
{
@@ -4199,7 +4199,7 @@ struct trap *ttmp;
}
/* removes traps that shoot arrows, darts, etc. */
STATIC_OVL int
static int
disarm_shooting_trap(ttmp, otyp)
struct trap *ttmp;
int otyp;
@@ -4215,7 +4215,7 @@ int otyp;
/* Is the weight too heavy?
* Formula as in near_capacity() & check_capacity() */
STATIC_OVL int
static int
try_lift(mtmp, ttmp, wt, stuff)
struct monst *mtmp;
struct trap *ttmp;
@@ -4240,7 +4240,7 @@ boolean stuff;
}
/* Help trapped monster (out of a (spiked) pit) */
STATIC_OVL int
static int
help_monster_out(mtmp, ttmp)
struct monst *mtmp;
struct trap *ttmp;
@@ -5003,7 +5003,7 @@ boolean u_entering_trap2;
return FALSE;
}
STATIC_OVL void
static void
clear_conjoined_pits(trap)
struct trap *trap;
{
@@ -5027,7 +5027,7 @@ struct trap *trap;
}
}
STATIC_OVL boolean
static boolean
adj_nonconjoined_pit(adjtrap)
struct trap *adjtrap;
{
@@ -5050,7 +5050,7 @@ struct trap *adjtrap;
* Mark all neighboring pits as conjoined pits.
* (currently not called from anywhere)
*/
STATIC_OVL void
static void
join_adjacent_pits(trap)
struct trap *trap;
{
@@ -5134,7 +5134,7 @@ int bodypart;
/* Monster is hit by trap. */
/* Note: doesn't work if both obj and d_override are null */
STATIC_OVL boolean
static boolean
thitm(tlev, mon, obj, d_override, nocorpse)
int tlev;
struct monst *mon;
@@ -5390,7 +5390,7 @@ sokoban_guilt()
}
/* called when a trap has been deleted or had its ttyp replaced */
STATIC_OVL void
static void
maybe_finish_sokoban()
{
struct trap *t;