[Refactor] #37353 モンスターフラグの光源持ち定義を monsterrace.h へ移動。

diff --git a/src/defines.h b/src/defines.h
index be6b72d..65b5a21 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -281,21 +281,11 @@
 #define OBJ_GOLD_LIST   480     /* First "gold" entry */
 #define MAX_GOLD        18      /* Number of "gold" entries */
 
-/*** General flag values ***/
-
-
 /* Empty hand status */
 #define EMPTY_HAND_NONE 0x0000 /* Both hands are used */
 #define EMPTY_HAND_LARM 0x0001 /* Left hand is empty */
 #define EMPTY_HAND_RARM 0x0002 /* Right hand is empty */
 
-/*** General index values ***/
-
-
-
-/*** Object flag values ***/
-
-
 /*
  * Object flags
  *
@@ -329,22 +319,6 @@
 #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))
 
 
-
- /*
-  * Hack -- "torch" masks
-  */
-#define RF7_LITE_MASK \
-       (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2)
-
-#define RF7_DARK_MASK \
-       (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2)
-
-#define RF7_HAS_LD_MASK \
-       (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2)
-
-#define RF7_SELF_LD_MASK \
-       (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2)
-
   /*
    * Hack -- effective elemental and poison immunity mask
    */

diff --git a/src/monsterrace.h b/src/monsterrace.h
index 9d9cb7d..bb1b5a5 100644 (file)
--- a/src/monsterrace.h
+++ b/src/monsterrace.h
@@ -439,6 +439,14 @@ struct monster_race
        u32b r_flagsr;                  /* Observed racial resistance flags */
 };
 
+/*
+ * Hack -- "torch" masks
+ */
+#define RF7_LITE_MASK    (RF7_HAS_LITE_1 | RF7_SELF_LITE_1 | RF7_HAS_LITE_2 | RF7_SELF_LITE_2)
+#define RF7_DARK_MASK    (RF7_HAS_DARK_1 | RF7_SELF_DARK_1 | RF7_HAS_DARK_2 | RF7_SELF_DARK_2)
+#define RF7_HAS_LD_MASK  (RF7_HAS_LITE_1 | RF7_HAS_LITE_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2)
+#define RF7_SELF_LD_MASK (RF7_SELF_LITE_1 | RF7_SELF_LITE_2 | RF7_SELF_DARK_1 | RF7_SELF_DARK_2)
+
 
 /*
  * The monster race arrays