remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core

src/zap.c

@@ -12,20 +12,20 @@
  */
 #define MAGIC_COOKIE 1000
 
-STATIC_DCL void FDECL(polyuse, (struct obj *, int, int));
-STATIC_DCL void FDECL(create_polymon, (struct obj *, int));
-STATIC_DCL int FDECL(stone_to_flesh_obj, (struct obj *));
-STATIC_DCL boolean FDECL(zap_updown, (struct obj *));
-STATIC_DCL void FDECL(zhitu, (int, int, const char *, XCHAR_P, XCHAR_P));
-STATIC_DCL void FDECL(revive_egg, (struct obj *));
-STATIC_DCL boolean FDECL(zap_steed, (struct obj *));
-STATIC_DCL void FDECL(skiprange, (int, int *, int *));
-STATIC_DCL int FDECL(zap_hit, (int, int));
-STATIC_OVL void FDECL(disintegrate_mon, (struct monst *, int, const char *));
-STATIC_DCL void FDECL(backfire, (struct obj *));
-STATIC_DCL int FDECL(spell_hit_bonus, (int));
-STATIC_DCL void FDECL(destroy_one_item, (struct obj *, int, int));
-STATIC_DCL void FDECL(wishcmdassist, (int));
+static void FDECL(polyuse, (struct obj *, int, int));
+static void FDECL(create_polymon, (struct obj *, int));
+static int FDECL(stone_to_flesh_obj, (struct obj *));
+static boolean FDECL(zap_updown, (struct obj *));
+static void FDECL(zhitu, (int, int, const char *, XCHAR_P, XCHAR_P));
+static void FDECL(revive_egg, (struct obj *));
+static boolean FDECL(zap_steed, (struct obj *));
+static void FDECL(skiprange, (int, int *, int *));
+static int FDECL(zap_hit, (int, int));
+static void FDECL(disintegrate_mon, (struct monst *, int, const char *));
+static void FDECL(backfire, (struct obj *));
+static int FDECL(spell_hit_bonus, (int));
+static void FDECL(destroy_one_item, (struct obj *, int, int));
+static void FDECL(wishcmdassist, (int));
 
 #define ZT_MAGIC_MISSILE (AD_MAGM - 1)
 #define ZT_FIRE (AD_FIRE - 1)
@@ -46,7 +46,7 @@ STATIC_DCL void FDECL(wishcmdassist, (int));
 #define M_IN_WATER(ptr) \
     ((ptr)->mlet == S_EEL || amphibious(ptr) || is_swimmer(ptr))
 
-STATIC_VAR const char are_blinded_by_the_flash[] =
+static const char are_blinded_by_the_flash[] =
     "are blinded by the flash!";
 
 const char *const flash_types[] =       /* also used in buzzmu(mcastu.c) */
@@ -935,7 +935,7 @@ boolean by_hero;
     return mtmp;
 }
 
-STATIC_OVL void
+static void
 revive_egg(obj)
 struct obj *obj;
 {
@@ -1216,7 +1216,7 @@ struct obj *obj;
  * there's a random factor here to keep from always using the stuff
  * at the top of the pile.
  */
-STATIC_OVL void
+static void
 polyuse(objhdr, mat, minwt)
 struct obj *objhdr;
 int mat, minwt;
@@ -1259,7 +1259,7 @@ int mat, minwt;
  * Polymorph some of the stuff in this pile into a monster, preferably
  * a golem of the kind okind.
  */
-STATIC_OVL void
+static void
 create_polymon(obj, okind)
 struct obj *obj;
 int okind;
@@ -1680,7 +1680,7 @@ int id;
 }
 
 /* stone-to-flesh spell hits and maybe transforms or animates obj */
-STATIC_OVL int
+static int
 stone_to_flesh_obj(obj)
 struct obj *obj;
 {
@@ -2190,7 +2190,7 @@ register struct obj *obj;
     }
 }
 
-STATIC_OVL void
+static void
 backfire(otmp)
 struct obj *otmp;
 {
@@ -2654,7 +2654,7 @@ long duration;
  * Return TRUE if the steed was hit by the wand.
  * Return FALSE if the steed was not hit by the wand.
  */
-STATIC_OVL boolean
+static boolean
 zap_steed(obj)
 struct obj *obj; /* wand or spell */
 {
@@ -2798,7 +2798,7 @@ boolean youattack, allow_cancel_kill, self_cancel;
 }
 
 /* you've zapped an immediate type wand up or down */
-STATIC_OVL boolean
+static boolean
 zap_updown(obj)
 struct obj *obj; /* wand or spell */
 {
@@ -3097,7 +3097,7 @@ int dmg; /* base amount to be adjusted by bonus or penalty */
  * Generate the to hit bonus for a spell.  Based on the hero's skill in
  * spell class and dexterity.
  */
-STATIC_OVL int
+static int
 spell_hit_bonus(skill)
 int skill;
 {
@@ -3172,7 +3172,7 @@ register struct monst *mtmp;
             : "it");
 }
 
-STATIC_OVL void
+static void
 skiprange(range, skipstart, skipend)
 int range, *skipstart, *skipend;
 {
@@ -3745,7 +3745,7 @@ struct obj **ootmp; /* to return worn armor for caller to disintegrate */
     return tmp;
 }
 
-STATIC_OVL void
+static void
 zhitu(type, nd, fltxt, sx, sy)
 int type, nd;
 const char *fltxt;
@@ -3944,7 +3944,7 @@ boolean u_caused;
 }
 
 /* will zap/spell/breath attack score a hit against armor class `ac'? */
-STATIC_OVL int
+static int
 zap_hit(ac, type)
 int ac;
 int type; /* either hero cast spell type or 0 */
@@ -3962,7 +3962,7 @@ int type; /* either hero cast spell type or 0 */
     return (3 - chance < ac + spell_bonus);
 }
 
-STATIC_OVL void
+static void
 disintegrate_mon(mon, type, fltxt)
 struct monst *mon;
 int type; /* hero vs other */
@@ -4787,7 +4787,7 @@ const char *const destroy_strings[][3] = {
 
 /* guts of destroy_item(), which ought to be called maybe_destroy_items();
    caller must decide whether obj is eligible */
-STATIC_OVL void
+static void
 destroy_one_item(obj, osym, dmgtyp)
 struct obj *obj;
 int osym, dmgtyp;
@@ -5204,7 +5204,7 @@ int damage, tell;
 
 #define MAXWISHTRY 5
 
-STATIC_OVL void
+static void
 wishcmdassist(triesleft)
 int triesleft;
 {