remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core

src/display.c

@@ -123,27 +123,27 @@
  */
 #include "hack.h"
 
-STATIC_DCL void FDECL(display_monster,
+static void FDECL(display_monster,
                       (XCHAR_P, XCHAR_P, struct monst *, int, XCHAR_P));
-STATIC_DCL int FDECL(swallow_to_glyph, (int, int));
-STATIC_DCL void FDECL(display_warning, (struct monst *));
+static int FDECL(swallow_to_glyph, (int, int));
+static void FDECL(display_warning, (struct monst *));
 
-STATIC_DCL int FDECL(check_pos, (int, int, int));
-STATIC_DCL int FDECL(get_bk_glyph, (XCHAR_P, XCHAR_P));
-STATIC_DCL int FDECL(tether_glyph, (int, int));
+static int FDECL(check_pos, (int, int, int));
+static int FDECL(get_bk_glyph, (XCHAR_P, XCHAR_P));
+static int FDECL(tether_glyph, (int, int));
 
 /*#define WA_VERBOSE*/ /* give (x,y) locations for all "bad" spots */
 #ifdef WA_VERBOSE
-STATIC_DCL boolean FDECL(more_than_one, (int, int, int, int, int));
+static boolean FDECL(more_than_one, (int, int, int, int, int));
 #endif
 
-STATIC_DCL int FDECL(set_twall, (int, int, int, int, int, int, int, int));
-STATIC_DCL int FDECL(set_wall, (int, int, int));
-STATIC_DCL int FDECL(set_corn, (int, int, int, int, int, int, int, int));
-STATIC_DCL int FDECL(set_crosswall, (int, int));
-STATIC_DCL void FDECL(set_seenv, (struct rm *, int, int, int, int));
-STATIC_DCL void FDECL(t_warn, (struct rm *));
-STATIC_DCL int FDECL(wall_angle, (struct rm *));
+static int FDECL(set_twall, (int, int, int, int, int, int, int, int));
+static int FDECL(set_wall, (int, int, int));
+static int FDECL(set_corn, (int, int, int, int, int, int, int, int));
+static int FDECL(set_crosswall, (int, int));
+static void FDECL(set_seenv, (struct rm *, int, int, int, int));
+static void FDECL(t_warn, (struct rm *));
+static int FDECL(wall_angle, (struct rm *));
 
 #define remember_topology(x, y) (g.lastseentyp[x][y] = levl[x][y].typ)
 
@@ -376,7 +376,7 @@ int x, y, show;
  * a worm tail.
  *
  */
-STATIC_OVL void
+static void
 display_monster(x, y, mon, sightflags, worm_tail)
 register xchar x, y;        /* display position */
 register struct monst *mon; /* monster to display */
@@ -490,7 +490,7 @@ xchar worm_tail;            /* mon is actually a worm tail */
  *
  * Do not call for worm tails.
  */
-STATIC_OVL void
+static void
 display_warning(mon)
 register struct monst *mon;
 {
@@ -897,7 +897,7 @@ xchar x, y;
     }
 }
 
-STATIC_OVL int
+static int
 tether_glyph(x, y)
 int x, y;
 {
@@ -1800,7 +1800,7 @@ xchar x, y;
  * If you don't want a patchwork monster while hallucinating, decide on
  * a random monster in swallowed() and don't use what_mon() here.
  */
-STATIC_OVL int
+static int
 swallow_to_glyph(mnum, loc)
 int mnum;
 int loc;
@@ -1866,7 +1866,7 @@ xchar x, y;
  * than current data from the map.]
  */
 
-STATIC_OVL int
+static int
 get_bk_glyph(x, y)
 xchar x, y;
 {
@@ -1967,7 +1967,7 @@ int x, y, a, b, c, dd;
  *
  * Things that are ambiguous: lava
  */
-STATIC_OVL int
+static int
 check_pos(x, y, which)
 int x, y, which;
 {
@@ -1984,7 +1984,7 @@ int x, y, which;
 /* Return TRUE if more than one is non-zero. */
 /*ARGSUSED*/
 #ifdef WA_VERBOSE
-STATIC_OVL boolean
+static boolean
 more_than_one(x, y, a, b, c)
 int x, y, a, b, c;
 {
@@ -2000,7 +2000,7 @@ int x, y, a, b, c;
 #endif
 
 /* Return the wall mode for a T wall. */
-STATIC_OVL int
+static int
 set_twall(x0, y0, x1, y1, x2, y2, x3, y3)
 int x0, y0; /* used #if WA_VERBOSE */
 int x1, y1, x2, y2, x3, y3;
@@ -2025,7 +2025,7 @@ int x1, y1, x2, y2, x3, y3;
 }
 
 /* Return wall mode for a horizontal or vertical wall. */
-STATIC_OVL int
+static int
 set_wall(x, y, horiz)
 int x, y, horiz;
 {
@@ -2047,7 +2047,7 @@ int x, y, horiz;
 }
 
 /* Return a wall mode for a corner wall. (x4,y4) is the "inner" position. */
-STATIC_OVL int
+static int
 set_corn(x1, y1, x2, y2, x3, y3, x4, y4)
 int x1, y1, x2, y2, x3, y3, x4, y4;
 {
@@ -2076,7 +2076,7 @@ int x1, y1, x2, y2, x3, y3, x4, y4;
 }
 
 /* Return mode for a crosswall. */
-STATIC_OVL int
+static int
 set_crosswall(x, y)
 int x, y;
 {
@@ -2199,7 +2199,7 @@ unsigned char seenv_matrix[3][3] = { { SV2, SV1, SV0 },
 #define sign(z) ((z) < 0 ? -1 : ((z) > 0 ? 1 : 0))
 
 /* Set the seen vector of lev as if seen from (x0,y0) to (x,y). */
-STATIC_OVL void
+static void
 set_seenv(lev, x0, y0, x, y)
 struct rm *lev;
 int x0, y0, x, y; /* from, to */
@@ -2278,7 +2278,7 @@ static const int cross_matrix[4][6] = {
 };
 
 /* Print out a T wall warning and all interesting info. */
-STATIC_OVL void
+static void
 t_warn(lev)
 struct rm *lev;
 {
@@ -2311,7 +2311,7 @@ struct rm *lev;
  * draw diagrams.  See rm.h for more details on the wall modes and
  * seen vector (SV).
  */
-STATIC_OVL int
+static int
 wall_angle(lev)
 struct rm *lev;
 {