[Refactor] #37353 is_original_ap と is_original_ap_and_seen を monster.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 336ade2..67944ab 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2244,13 +2244,6 @@
 #define MR1_SINKA 0x01
 
 
-/* Hack -- Determine monster race appearance index is same as race index */
-#define is_original_ap(A) \
-        (bool)(((A)->ap_r_idx == (A)->r_idx) ? TRUE : FALSE)
-
-#define is_original_ap_and_seen(A) \
-        (bool)((A)->ml && !p_ptr->image && ((A)->ap_r_idx == (A)->r_idx))
-
 /*
  * Is the monster seen by the player?
  */

diff --git a/src/monster.h b/src/monster.h
index 4fb2c2a..15d0ab0 100644 (file)
--- a/src/monster.h
+++ b/src/monster.h
@@ -460,4 +460,11 @@ extern void monster_drop_carried_objects(monster_type *m_ptr);
         (bool)(((A)->smart & SM_PET) ? TRUE : FALSE)
 
 #define is_hostile(A) \
-        (bool)((is_friendly(A) || is_pet(A)) ? FALSE : TRUE)
\ No newline at end of file
+        (bool)((is_friendly(A) || is_pet(A)) ? FALSE : TRUE)
+
+/* Hack -- Determine monster race appearance index is same as race index */
+#define is_original_ap(A) \
+        (bool)(((A)->ap_r_idx == (A)->r_idx) ? TRUE : FALSE)
+
+#define is_original_ap_and_seen(A) \
+        (bool)((A)->ml && !p_ptr->image && ((A)->ap_r_idx == (A)->r_idx))
\ No newline at end of file