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
+22 -22
View File
@@ -19,24 +19,24 @@
#include "sfproto.h"
STATIC_DCL boolean FDECL(isbig, (struct mkroom *));
STATIC_DCL struct mkroom *FDECL(pick_room, (BOOLEAN_P));
STATIC_DCL void NDECL(mkshop), FDECL(mkzoo, (int)), NDECL(mkswamp);
STATIC_DCL void NDECL(mktemple);
STATIC_DCL coord *FDECL(shrine_pos, (int));
STATIC_DCL struct permonst *NDECL(morguemon);
STATIC_DCL struct permonst *NDECL(squadmon);
static boolean FDECL(isbig, (struct mkroom *));
static struct mkroom *FDECL(pick_room, (BOOLEAN_P));
static void NDECL(mkshop), FDECL(mkzoo, (int)), NDECL(mkswamp);
static void NDECL(mktemple);
static coord *FDECL(shrine_pos, (int));
static struct permonst *NDECL(morguemon);
static struct permonst *NDECL(squadmon);
/* SAVE2018 */
/* STATIC_DCL void FDECL(save_room, (int,struct mkroom *)); */
/* STATIC_DCL void FDECL(rest_room, (int,struct mkroom *)); */
STATIC_DCL void FDECL(save_room, (NHFILE *, struct mkroom *));
STATIC_DCL void FDECL(rest_room, (NHFILE *, struct mkroom *));
/* static void FDECL(save_room, (int,struct mkroom *)); */
/* static void FDECL(rest_room, (int,struct mkroom *)); */
static void FDECL(save_room, (NHFILE *, struct mkroom *));
static void FDECL(rest_room, (NHFILE *, struct mkroom *));
#define sq(x) ((x) * (x))
extern const struct shclass shtypes[]; /* defined in shknam.c */
STATIC_OVL boolean
static boolean
isbig(sroom)
register struct mkroom *sroom;
{
@@ -90,7 +90,7 @@ int roomtype;
}
}
STATIC_OVL void
static void
mkshop()
{
register struct mkroom *sroom;
@@ -208,7 +208,7 @@ gottype:
}
/* pick an unused room, preferably with only one door */
STATIC_OVL struct mkroom *
static struct mkroom *
pick_room(strict)
register boolean strict;
{
@@ -233,7 +233,7 @@ register boolean strict;
return (struct mkroom *) 0;
}
STATIC_OVL void
static void
mkzoo(type)
int type;
{
@@ -461,7 +461,7 @@ int mm_flags;
g.level.flags.graveyard = TRUE; /* reduced chance for undead corpse */
}
STATIC_OVL struct permonst *
static struct permonst *
morguemon()
{
register int i = rn2(100), hd = rn2(level_difficulty());
@@ -513,7 +513,7 @@ antholemon()
: &mons[mtyp]);
}
STATIC_OVL void
static void
mkswamp() /* Michiel Huisjes & Fred de Wilde */
{
register struct mkroom *sroom;
@@ -551,7 +551,7 @@ mkswamp() /* Michiel Huisjes & Fred de Wilde */
}
}
STATIC_OVL coord *
static coord *
shrine_pos(roomno)
int roomno;
{
@@ -573,7 +573,7 @@ int roomno;
return &buf;
}
STATIC_OVL void
static void
mktemple()
{
register struct mkroom *sroom;
@@ -773,7 +773,7 @@ static const struct {
{ PM_CAPTAIN, 1 } };
/* return soldier types. */
STATIC_OVL struct permonst *
static struct permonst *
squadmon()
{
int sel_prob, i, cpro, mndx;
@@ -800,7 +800,7 @@ gotone:
* save_room : A recursive function that saves a room and its subrooms
* (if any).
*/
STATIC_OVL void
static void
save_room(nhfp, r)
NHFILE *nhfp;
struct mkroom *r;
@@ -839,7 +839,7 @@ NHFILE *nhfp;
save_room(nhfp, &g.rooms[i]);
}
STATIC_OVL void
static void
rest_room(nhfp, r)
NHFILE *nhfp;
struct mkroom *r;