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

mktrap() flags

Browse Source 
This started out as a fix for a comment typo, then morphed a bit....
This commit is contained in:
PatR
2024-01-09 17:17:19 -08:00
parent d672ea3051
commit 3f3d5b7bda
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern.h
View File

@@ -1522,7 +1522,7 @@ extern void place_branch(branch *, coordxy, coordxy) NO_NNARGS;
extern boolean occupied(coordxy, coordxy);
extern int okdoor(coordxy, coordxy);
extern void dodoor(coordxy, coordxy, struct mkroom *) NONNULLARG3;
extern void mktrap(int, int, struct mkroom *, coord *) NO_NNARGS;
extern void mktrap(int, unsigned, struct mkroom *, coord *) NO_NNARGS;
extern void mkstairs(coordxy, coordxy, char, struct mkroom *, boolean);
extern void mkinvokearea(void);
extern void mineralize(int, int, int, int, boolean);

10
include/hack.h
View File

@@ -1341,11 +1341,11 @@ typedef uint32_t mmflags_nht; /* makemon MM_ flags */
#define TELEDS_TELEPORT 2
/* flags for mktrap() */
#define MKTRAP_NOFLAGS 0x0
#define MKTRAP_MAZEFLAG 0x1 /* trap placed on coords as if in maze */
#define MKTRAP_NOSPIDERONWEB 0x2 /* web will not generate a spider */
#define MKTRAP_SEEN 0x4 /* trap is seen */
#define MKTRAP_NOVICTIM 0x8 /* no victim corpse or items on it */
#define MKTRAP_NOFLAGS 0x0U
#define MKTRAP_SEEN 0x1U /* trap is seen */
#define MKTRAP_MAZEFLAG 0x2U /* choose random coords instead of room */
#define MKTRAP_NOSPIDERONWEB 0x4U /* web will not generate a spider */
#define MKTRAP_NOVICTIM 0x8U /* no victim corpse or items on it */
#define MON_POLE_DIST 5 /* How far monsters can use pole-weapons */
#define PET_MISSILE_RANGE2 36 /* Square of distance within which pets shoot */

2
src/mklev.c
View File

@@ -1724,7 +1724,7 @@ mktrap_victim(struct trap *ttmp)
void
mktrap(
int num, /* if non-zero, specific type of trap to make */
int mktrapflags, /* MKTRAP_NOSPIDERWEB, WKTRAP_MAZEFLAG */
unsigned mktrapflags, /* MKTRAP_{SEEN,MAZEFLAG,NOSPIDERONWEB,NOVICTIM} */
struct mkroom *croom, /* room to hold trap */
coord *tm) /* specific location for trap */
{

2
src/sp_lev.c
View File

@@ -1788,7 +1788,7 @@ create_trap(spltrap *t, struct mkroom *croom)
{
coordxy x = -1, y = -1;
coord tm;
int mktrap_flags = MKTRAP_MAZEFLAG;
unsigned mktrap_flags = MKTRAP_MAZEFLAG;
if (t->type == VIBRATING_SQUARE) {
pick_vibrasquare_location();