From 3f3d5b7bdaea26e4ac66fe78e51bb8e3f2935e0b Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Tue, 9 Jan 2024 17:17:19 -0800
Subject: [PATCH] mktrap() flags

This started out as a fix for a comment typo, then morphed a bit....
---
 include/extern.h |  2 +-
 include/hack.h   | 10 +++++-----
 src/mklev.c      |  2 +-
 src/sp_lev.c     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/extern.h b/include/extern.h
index 6125a3eb4..588a83be4 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -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);
diff --git a/include/hack.h b/include/hack.h
index ebf9b1ee6..085e443ce 100644
--- a/include/hack.h
+++ b/include/hack.h
@@ -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 */
diff --git a/src/mklev.c b/src/mklev.c
index d34136fff..f0d90b8c8 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -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 */
 {
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 4151643a3..17908bc2e 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -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();