nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

ranged_attk() - there can be only one

Browse Source 
Relocate the newer code for the function to mdlib.c
where makedefs can still use it.
This commit is contained in:
nhmall
2022-11-05 13:07:10 -04:00
parent eeedff9478
commit b399e3f2f5
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -1308,6 +1308,7 @@ extern int buzzmu(struct monst *, struct attack *);
extern void runtime_info_init(void); extern void runtime_info_init(void);
extern const char *do_runtime_info(int *); extern const char *do_runtime_info(int *);
extern boolean ranged_attk(struct permonst *);
extern void release_runtime_info(void); extern void release_runtime_info(void);
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
extern void dump_glyphids(void); extern void dump_glyphids(void);
@@ -1620,7 +1621,6 @@ extern boolean resists_drli(struct monst *);
extern boolean resists_magm(struct monst *); extern boolean resists_magm(struct monst *);
extern boolean resists_blnd(struct monst *); extern boolean resists_blnd(struct monst *);
extern boolean can_blnd(struct monst *, struct monst *, uchar, struct obj *); 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 mon_hates_silver(struct monst *);
extern boolean hates_silver(struct permonst *); extern boolean hates_silver(struct permonst *);
extern boolean mon_hates_blessings(struct monst *); extern boolean mon_hates_blessings(struct monst *);

17
src/mdlib.c
View File

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

12
src/mondata.c
View File

@@ -302,18 +302,6 @@ can_blnd(
return TRUE; 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 */ /* True if specific monster is especially affected by silver weapons */
boolean boolean
mon_hates_silver(struct monst *mon) mon_hates_silver(struct monst *mon)