[Refactor] #37353 CEM_* を monster.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index ad476db..f538522 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -98,13 +98,6 @@
 #define ROW_MAP                 0
 #define COL_MAP                 12
 
-/*
- * Bit flags for the *_can_enter() and monster_can_cross_terrain()
- */
-#define CEM_RIDING              0x0001
-#define CEM_P_CAN_ENTER_PATTERN 0x0002
-
-
 #define OBJ_GOLD_LIST   480     /* First "gold" entry */
 #define MAX_GOLD        18      /* Number of "gold" entries */
 

diff --git a/src/monster.h b/src/monster.h
index f4cab6a..4062844 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -424,8 +424,15 @@ extern void set_friendly(monster_type *m_ptr);
 extern void set_pet(monster_type *m_ptr);
 extern void set_hostile(monster_type *m_ptr);
 extern void anger_monster(monster_type *m_ptr);
+
+/*
+ * Bit flags for the *_can_enter() and monster_can_cross_terrain()
+ */
+#define CEM_RIDING              0x0001
+#define CEM_P_CAN_ENTER_PATTERN 0x0002
 extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode);
 extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 mode);
+
 extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
 extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
 extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);