ranged_attk() - there can be only one

Relocate the newer code for the function to mdlib.c
where makedefs can still use it.

diff --git a/include/extern.h b/include/extern.h
index 958f9ac2da4a89f228424cdecfc6c34918a2a833..051c40fc175ae55beac7e8d67756ff57042bcd2e 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1308,6 +1308,7 @@ extern int buzzmu(struct monst *, struct attack *);
 
 extern void runtime_info_init(void);
 extern const char *do_runtime_info(int *);
+extern boolean ranged_attk(struct permonst *);
 extern void release_runtime_info(void);
 #ifdef ENHANCED_SYMBOLS
 extern void dump_glyphids(void);
@@ -1620,7 +1621,6 @@ extern boolean resists_drli(struct monst *);
 extern boolean resists_magm(struct monst *);
 extern boolean resists_blnd(struct monst *);
 extern boolean can_blnd(struct monst *, struct monst *, uchar, struct obj *);
-extern boolean ranged_attk(struct permonst *);
 extern boolean mon_hates_silver(struct monst *);
 extern boolean hates_silver(struct permonst *);
 extern boolean mon_hates_blessings(struct monst *);

diff --git a/src/mdlib.c b/src/mdlib.c
index 400a0f2b89eb7a9c1844d6886627c55b003af4d7..6a9d8f7745a8013ddc28f6f02088f6d134aa1a56 100644 (file)
--- a/src/mdlib.c
+++ b/src/mdlib.c
@@ -62,6 +62,7 @@ int case_insensitive_comp(const char *, const char *);
 static void make_version(void);
 static char *eos(char *);
 int mstrength(struct permonst *);
+boolean ranged_attk(struct permonst *);
 
 #if 0
 static char *mdlib_strsubst(char *, const char *, const char *);
@@ -313,7 +314,6 @@ RESTORE_WARNING_FORMAT_NONLITERAL
  *      transfer relevant generated monstr values to include/monsters.h;
  *      delete src/monstr.c.
  */
-static boolean mdlib_ranged_attk(struct permonst *);
 
  /*
  * This routine is designed to return an integer value which represents
@@ -333,7 +333,7 @@ mstrength(struct permonst* ptr)
     n += (!!(ptr->geno & G_LGROUP)) << 1;
 
     /* for ranged attacks */
-    if (mdlib_ranged_attk(ptr))
+    if (ranged_attk(ptr))
         n++;
 
     /* for higher ac values */
@@ -379,17 +379,14 @@ mstrength(struct permonst* ptr)
 }
 
 /* returns True if monster can attack at range */
-static boolean
-mdlib_ranged_attk(register struct permonst* ptr)
+boolean
+ranged_attk(struct permonst* ptr)
 {
-    register int i, j;
-    register int atk_mask = (1 << AT_BREA) | (1 << AT_SPIT) | (1 << AT_GAZE);
+    int i;
 
-    for (i = 0; i < NATTK; i++) {
-        if ((j = ptr->mattk[i].aatyp) >= AT_WEAP
-            || (j < 32 && (atk_mask & (1 << j)) != 0))
+    for (i = 0; i < NATTK; i++)
+        if (DISTANCE_ATTK_TYPE(ptr->mattk[i].aatyp))
             return TRUE;
-    }
     return FALSE;
 }
 #endif /* (NH_DEVEL_STATUS != NH_STATUS_RELEASED) || DEBUG || MAKEDEFS_C */

diff --git a/src/mondata.c b/src/mondata.c
index 0278195f8a25b653562d0892091b3769a61f1ca4..bdadbae2bc5ab228f94bf6b912e707dd5e1bf58d 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -302,18 +302,6 @@ can_blnd(
     return TRUE;
 }
 
-/* returns True if monster can attack at range */
-boolean
-ranged_attk(struct permonst* ptr)
-{
-    int i;
-
-    for (i = 0; i < NATTK; i++)
-        if (DISTANCE_ATTK_TYPE(ptr->mattk[i].aatyp))
-            return TRUE;
-    return FALSE;
-}
-
 /* True if specific monster is especially affected by silver weapons */
 boolean
 mon_hates_silver(struct monst *mon)