remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core

src/vision.c

@@ -83,14 +83,14 @@ static char left_ptrs[ROWNO][COLNO]; /* LOS algorithm helpers */
 static char right_ptrs[ROWNO][COLNO];
 
 /* Forward declarations. */
-STATIC_DCL void FDECL(fill_point, (int, int));
-STATIC_DCL void FDECL(dig_point, (int, int));
-STATIC_DCL void NDECL(view_init);
-STATIC_DCL void FDECL(view_from, (int, int, char **, char *, char *, int,
+static void FDECL(fill_point, (int, int));
+static void FDECL(dig_point, (int, int));
+static void NDECL(view_init);
+static void FDECL(view_from, (int, int, char **, char *, char *, int,
                                   void (*)(int, int, genericptr_t),
                                   genericptr_t));
-STATIC_DCL void FDECL(get_unused_cs, (char ***, char **, char **));
-STATIC_DCL void FDECL(rogue_vision, (char **, char *, char *));
+static void FDECL(get_unused_cs, (char ***, char **, char **));
+static void FDECL(rogue_vision, (char **, char *, char *));
 
 /* Macro definitions that I can't find anywhere. */
 #define sign(z) ((z) < 0 ? -1 : ((z) ? 1 : 0))
@@ -241,7 +241,7 @@ vision_reset()
  * Called from vision_recalc() and at least one light routine.  Get pointers
  * to the unused vision work area.
  */
-STATIC_OVL void
+static void
 get_unused_cs(rows, rmin, rmax)
 char ***rows;
 char **rmin, **rmax;
@@ -283,7 +283,7 @@ char **rmin, **rmax;
  * We set the in_sight bit here as well to escape a bug that shows up
  * due to the one-sided lit wall hack.
  */
-STATIC_OVL void
+static void
 rogue_vision(next, rmin, rmax)
 char **next; /* could_see array pointers */
 char *rmin, *rmax;
@@ -342,7 +342,7 @@ char *rmin, *rmax;
 
 #ifdef EXTEND_SPINE
 
-STATIC_DCL int FDECL(new_angle, (struct rm *, unsigned char *, int, int));
+static int FDECL(new_angle, (struct rm *, unsigned char *, int, int));
 /*
  * new_angle()
  *
@@ -385,7 +385,7 @@ STATIC_DCL int FDECL(new_angle, (struct rm *, unsigned char *, int, int));
  *        many exceptions.  I may have to bite the bullet and do more
  *        checks.       - Dean 2/11/93
  */
-STATIC_OVL int
+static int
 new_angle(lev, sv, row, col)
 struct rm *lev;
 unsigned char *sv;
@@ -912,7 +912,7 @@ int x, y;
  *   This means that a right-edge (a blocked spot that has an open
  *    spot on its right) will point to itself.
  */
-STATIC_OVL void
+static void
 dig_point(row, col)
 int row, col;
 {
@@ -997,7 +997,7 @@ int row, col;
     }
 }
 
-STATIC_OVL void
+static void
 fill_point(row, col)
 int row, col;
 {
@@ -1342,10 +1342,10 @@ static genericptr_t varg;
 
 #else /* !MACRO_CPATH -- quadrants are really functions */
 
-STATIC_DCL int FDECL(_q1_path, (int, int, int, int));
-STATIC_DCL int FDECL(_q2_path, (int, int, int, int));
-STATIC_DCL int FDECL(_q3_path, (int, int, int, int));
-STATIC_DCL int FDECL(_q4_path, (int, int, int, int));
+static int FDECL(_q1_path, (int, int, int, int));
+static int FDECL(_q2_path, (int, int, int, int));
+static int FDECL(_q3_path, (int, int, int, int));
+static int FDECL(_q4_path, (int, int, int, int));
 
 #define q1_path(sy, sx, y, x, dummy) result = _q1_path(sy, sx, y, x)
 #define q2_path(sy, sx, y, x, dummy) result = _q2_path(sy, sx, y, x)
@@ -1355,7 +1355,7 @@ STATIC_DCL int FDECL(_q4_path, (int, int, int, int));
 /*
  * Quadrant I (step < 0).
  */
-STATIC_OVL int
+static int
 _q1_path(srow, scol, y2, x2)
 int scol, srow, y2, x2;
 {
@@ -1403,7 +1403,7 @@ int scol, srow, y2, x2;
 /*
  * Quadrant IV (step > 0).
  */
-STATIC_OVL int
+static int
 _q4_path(srow, scol, y2, x2)
 int scol, srow, y2, x2;
 {
@@ -1451,7 +1451,7 @@ int scol, srow, y2, x2;
 /*
  * Quadrant II (step < 0).
  */
-STATIC_OVL int
+static int
 _q2_path(srow, scol, y2, x2)
 int scol, srow, y2, x2;
 {
@@ -1499,7 +1499,7 @@ int scol, srow, y2, x2;
 /*
  * Quadrant III (step > 0).
  */
-STATIC_OVL int
+static int
 _q3_path(srow, scol, y2, x2)
 int scol, srow, y2, x2;
 {
@@ -1601,18 +1601,18 @@ cleardone:
 static close2d *close_dy[CLOSE_MAX_BC_DY];
 static far2d *far_dy[FAR_MAX_BC_DY];
 
-STATIC_DCL void FDECL(right_side,  (int, int, int, int, int,
+static void FDECL(right_side,  (int, int, int, int, int,
                                     int, int, const char *));
-STATIC_DCL void FDECL(left_side, (int, int, int, int, int, int, int, 
+static void FDECL(left_side, (int, int, int, int, int, int, int, 
                                     const char *));
-STATIC_DCL int FDECL(close_shadow, (int, int, int, int));
-STATIC_DCL int FDECL(far_shadow, (int, int, int, int));
+static int FDECL(close_shadow, (int, int, int, int));
+static int FDECL(far_shadow, (int, int, int, int));
 
 /*
  * Initialize algorithm D's table pointers.  If we don't have these,
  * then we do 3D table lookups.  Verrrry slow.
  */
-STATIC_OVL void
+static void
 view_init()
 {
     int i;
@@ -1631,7 +1631,7 @@ view_init()
  */
 #define OFF_TABLE 0xff
 
-STATIC_OVL int
+static int
 close_shadow(side, this_row, block_row, block_col)
 int side, this_row, block_row, block_col;
 {
@@ -1664,7 +1664,7 @@ int side, this_row, block_row, block_col;
     return block_col - offset;
 }
 
-STATIC_OVL int
+static int
 far_shadow(side, this_row, block_row, block_col)
 int side, this_row, block_row, block_col;
 {
@@ -1710,7 +1710,7 @@ int side, this_row, block_row, block_col;
  *
  * Figure out what could be seen on the right side of the source.
  */
-STATIC_OVL void
+static void
 right_side(row, cb_row, cb_col, fb_row, fb_col, left, right_mark, limits)
 int row;            /* current row */
 int cb_row, cb_col; /* close block row and col */
@@ -1988,7 +1988,7 @@ char *limits;       /* points at range limit for current row, or NULL */
  * This routine is the mirror image of right_side().  Please see right_side()
  * for blow by blow comments.
  */
-STATIC_OVL void
+static void
 left_side(row, cb_row, cb_col, fb_row, fb_col, left_mark, right, limits)
 int row;            /* the current row */
 int cb_row, cb_col; /* close block row and col */
@@ -2190,7 +2190,7 @@ const char *limits;
  * seen from the source location.  Initialize and fill the left most
  * and right most boundaries of what could be seen.
  */
-STATIC_OVL void
+static void
 view_from(srow, scol, loc_cs_rows, left_most, right_most, range, func, arg)
 int srow, scol;               /* source row and column */
 char **loc_cs_rows;           /* could_see array (row pointers) */
@@ -2286,11 +2286,11 @@ genericptr_t arg;
 /*
  * Defines local to Algorithm C.
  */
-STATIC_DCL void FDECL(right_side, (int, int, int, const char *));
-STATIC_DCL void FDECL(left_side, (int, int, int, const char *));
+static void FDECL(right_side, (int, int, int, const char *));
+static void FDECL(left_side, (int, int, int, const char *));
 
 /* Initialize algorithm C (nothing). */
-STATIC_OVL void
+static void
 view_init()
 {
 }
@@ -2299,7 +2299,7 @@ view_init()
  * Mark positions as visible on one quadrant of the right side.  The
  * quadrant is determined by the value of the global variable step.
  */
-STATIC_OVL void
+static void
 right_side(row, left, right_mark, limits)
 int row;        /* current row */
 int left;       /* first (left side) visible spot on prev row */
@@ -2491,7 +2491,7 @@ const char *limits;   /* points at range limit for current row, or NULL */
  * This routine is the mirror image of right_side().  See right_side() for
  * extensive comments.
  */
-STATIC_OVL void
+static void
 left_side(row, left_mark, right, limits)
 int row, left_mark, right;
 const char *limits;
@@ -2627,7 +2627,7 @@ const char *limits;
  * (srow,scol).  NOTE this is (y,x)!  Mark the visible locations in the
  * array provided.
  */
-STATIC_OVL void
+static void
 view_from(srow, scol, loc_cs_rows, left_most, right_most, range, func, arg)
 int srow, scol;     /* starting row and column */
 char **loc_cs_rows; /* pointers to the rows of the could_see array */