[Refactor] #40569 Moved DUNGEON_MODE_* from floor.h to monster-util.c

diff --git a/src/floor/floor.h b/src/floor/floor.h
index fcacdbf..c04b0bb 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -5,12 +5,6 @@
 typedef struct floor_type floor_type;
 extern floor_type floor_info;
 
-#define DUNGEON_MODE_NONE       0
-#define DUNGEON_MODE_AND        1
-#define DUNGEON_MODE_NAND       2
-#define DUNGEON_MODE_OR         3
-#define DUNGEON_MODE_NOR        4
-
 /*** Dungeon type flags -- DG ***/
 #define DF1_WINNER              0x00000001L
 #define DF1_MAZE                0x00000002L

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index 890ac81..57ecf58 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -18,6 +18,13 @@
 #include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 
+typedef enum dungeon_mode_type {
+    DUNGEON_MODE_AND = 1,
+    DUNGEON_MODE_NAND = 2,
+    DUNGEON_MODE_OR = 3,
+    DUNGEON_MODE_NOR = 4,
+} dungeon_mode_type;
+
 MONSTER_IDX hack_m_idx = 0; /* Hack -- see "process_monsters()" */
 MONSTER_IDX hack_m_idx_ii = 0;