remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core

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

View File

@@ -8,16 +8,16 @@
#include "sfproto.h"
STATIC_DCL void NDECL(stoned_dialogue);
STATIC_DCL void NDECL(vomiting_dialogue);
STATIC_DCL void NDECL(choke_dialogue);
STATIC_DCL void NDECL(levitation_dialogue);
STATIC_DCL void NDECL(slime_dialogue);
STATIC_DCL void FDECL(slimed_to_death, (struct kinfo *));
STATIC_DCL void NDECL(slip_or_trip);
STATIC_DCL void FDECL(see_lamp_flicker, (struct obj *, const char *));
STATIC_DCL void FDECL(lantern_message, (struct obj *));
STATIC_DCL void FDECL(cleanup_burn, (ANY_P *, long));
static void NDECL(stoned_dialogue);
static void NDECL(vomiting_dialogue);
static void NDECL(choke_dialogue);
static void NDECL(levitation_dialogue);
static void NDECL(slime_dialogue);
static void FDECL(slimed_to_death, (struct kinfo *));
static void NDECL(slip_or_trip);
static void FDECL(see_lamp_flicker, (struct obj *, const char *));
static void FDECL(lantern_message, (struct obj *));
static void FDECL(cleanup_burn, (ANY_P *, long));
/* used by wizard mode #timeout and #wizintrinsic; order by 'interest'
for timeout countdown, where most won't occur in normal play */
@@ -107,7 +107,7 @@ static NEARDATA const char *const stoned_texts[] = {
"You are a statue." /* 1 */
};
STATIC_OVL void
static void
stoned_dialogue()
{
register long i = (Stoned & TIMEOUT);
@@ -167,7 +167,7 @@ static NEARDATA const char *const vomiting_texts[] = {
"are about to vomit." /* 2 */
};
STATIC_OVL void
static void
vomiting_dialogue()
{
const char *txt = 0;
@@ -248,7 +248,7 @@ static NEARDATA const char *const choke_texts2[] = {
"You suffocate."
};
STATIC_OVL void
static void
choke_dialogue()
{
register long i = (Strangled & TIMEOUT);
@@ -273,7 +273,7 @@ static NEARDATA const char *const levi_texts[] = {
"You wobble unsteadily %s the %s."
};
STATIC_OVL void
static void
levitation_dialogue()
{
/* -1 because the last message comes via float_down() */
@@ -308,7 +308,7 @@ static NEARDATA const char *const slime_texts[] = {
"You have become %s." /* 1 */
};
STATIC_OVL void
static void
slime_dialogue()
{
register long i = (Slimed & TIMEOUT) / 2L;
@@ -368,7 +368,7 @@ burn_away_slime()
}
/* countdown timer for turning into green slime has run out; kill our hero */
STATIC_OVL void
static void
slimed_to_death(kptr)
struct kinfo *kptr;
{
@@ -446,7 +446,7 @@ static NEARDATA const char *const phaze_texts[] = {
"You are feeling rather flabby.",
};
STATIC_OVL void
static void
phaze_dialogue()
{
long i = ((HPasses_walls & TIMEOUT) / 2L);
@@ -974,7 +974,7 @@ struct obj *figurine;
}
/* give a fumble message */
STATIC_OVL void
static void
slip_or_trip()
{
struct obj *otmp = vobj_at(u.ux, u.uy), *otmp2;
@@ -1065,7 +1065,7 @@ slip_or_trip()
}
/* Print a lamp flicker message with tailer. */
STATIC_OVL void
static void
see_lamp_flicker(obj, tailer)
struct obj *obj;
const char *tailer;
@@ -1082,7 +1082,7 @@ const char *tailer;
}
/* Print a dimming message for brass lanterns. */
STATIC_OVL void
static void
lantern_message(obj)
struct obj *obj;
{
@@ -1662,15 +1662,15 @@ do_storms()
* Check whether object has a timer of type timer_type.
*/
STATIC_DCL const char *FDECL(kind_name, (SHORT_P));
STATIC_DCL void FDECL(print_queue, (winid, timer_element *));
STATIC_DCL void FDECL(insert_timer, (timer_element *));
STATIC_DCL timer_element *FDECL(remove_timer,
static const char *FDECL(kind_name, (SHORT_P));
static void FDECL(print_queue, (winid, timer_element *));
static void FDECL(insert_timer, (timer_element *));
static timer_element *FDECL(remove_timer,
(timer_element **, SHORT_P, ANY_P *));
STATIC_DCL void FDECL(write_timer, (NHFILE *, timer_element *));
STATIC_DCL boolean FDECL(mon_is_local, (struct monst *));
STATIC_DCL boolean FDECL(timer_is_local, (timer_element *));
STATIC_DCL int FDECL(maybe_write_timer, (NHFILE *, int, BOOLEAN_P));
static void FDECL(write_timer, (NHFILE *, timer_element *));
static boolean FDECL(mon_is_local, (struct monst *));
static boolean FDECL(timer_is_local, (timer_element *));
static int FDECL(maybe_write_timer, (NHFILE *, int, BOOLEAN_P));
/* If defined, then include names when printing out the timer queue */
#define VERBOSE_TIMER
@@ -1703,7 +1703,7 @@ static const ttable timeout_funcs[NUM_TIME_FUNCS] = {
};
#undef TTAB
STATIC_OVL const char *
static const char *
kind_name(kind)
short kind;
{
@@ -1720,7 +1720,7 @@ short kind;
return "unknown";
}
STATIC_OVL void
static void
print_queue(win, base)
winid win;
timer_element *base;
@@ -2072,7 +2072,7 @@ short func_index;
}
/* Insert timer into the global queue */
STATIC_OVL void
static void
insert_timer(gnu)
timer_element *gnu;
{
@@ -2089,7 +2089,7 @@ timer_element *gnu;
g.timer_base = gnu;
}
STATIC_OVL timer_element *
static timer_element *
remove_timer(base, func_index, arg)
timer_element **base;
short func_index;
@@ -2111,7 +2111,7 @@ anything *arg;
return curr;
}
STATIC_OVL void
static void
write_timer(nhfp, timer)
NHFILE *nhfp;
timer_element *timer;
@@ -2205,7 +2205,7 @@ struct obj *obj;
* Return TRUE if the given monster will stay on the level when the
* level is saved.
*/
STATIC_OVL boolean
static boolean
mon_is_local(mon)
struct monst *mon;
{
@@ -2225,7 +2225,7 @@ struct monst *mon;
* Return TRUE if the timer is attached to something that will stay on the
* level when the level is saved.
*/
STATIC_OVL boolean
static boolean
timer_is_local(timer)
timer_element *timer;
{
@@ -2247,7 +2247,7 @@ timer_element *timer;
* Part of the save routine. Count up the number of timers that would
* be written. If write_it is true, actually write the timer.
*/
STATIC_OVL int
static int
maybe_write_timer(nhfp, range, write_it)
NHFILE *nhfp;
int range;