[Refactor] #37353 CAVE_* をgrid.hへ移動。

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index 2fa9687..d97ecbd 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "monster-spell.h"

diff --git a/src/defines.h b/src/defines.h
index 211f9a2..5fe7a27 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1788,42 +1788,8 @@
 #define OBJ_GOLD_LIST   480     /* First "gold" entry */
 #define MAX_GOLD        18      /* Number of "gold" entries */
 
-
 /*** General flag values ***/
 
-
-/*
- * 特殊なマス状態フラグ / Special grid flags
- */
-#define CAVE_MARK       0x0001    /*!< 現在プレイヤーの記憶に収まっている / memorized feature */
-#define CAVE_GLOW       0x0002    /*!< マス自体が光源を持っている / self-illuminating */
-#define CAVE_ICKY       0x0004    /*!< 生成されたVaultの一部である / part of a vault */
-#define CAVE_ROOM       0x0008    /*!< 生成された部屋の一部である / part of a room */
-#define CAVE_LITE       0x0010    /*!< 現在光に照らされている / lite flag  */
-#define CAVE_VIEW       0x0020    /*!< 現在プレイヤーの視界に収まっている / view flag */
-#define CAVE_TEMP       0x0040    /*!< 光源に関する処理のアルゴリズム用記録フラグ / temp flag */
-#define CAVE_XTRA       0x0080    /*!< 視界に関する処理のアルゴリズム用記録フラグ(update_view()等参照) / misc flag */
-#define CAVE_MNLT       0x0100    /*!< モンスターの光源によって照らされている / Illuminated by monster */
-#define CAVE_MNDK       0x8000    /*!< モンスターの暗源によって暗闇になっている / Darken by monster */
-
-/* Used only while current_floor_ptr->grid_array generation */
-#define CAVE_FLOOR      0x0200 /*!< フロア属性のあるマス */
-#define CAVE_EXTRA      0x0400
-#define CAVE_INNER      0x0800
-#define CAVE_OUTER      0x1000
-#define CAVE_SOLID      0x2000
-#define CAVE_VAULT      0x4000
-#define CAVE_MASK (CAVE_FLOOR | CAVE_EXTRA | CAVE_INNER | CAVE_OUTER | CAVE_SOLID | CAVE_VAULT)
-
-/* Used only after current_floor_ptr->grid_array generation */
-#define CAVE_KNOWN      0x0200    /* Directly viewed or map detected flag */
-#define CAVE_NOTE       0x0400    /* Flag for delayed visual update (needs note_spot()) */
-#define CAVE_REDRAW     0x0800    /* Flag for delayed visual update (needs lite_spot()) */
-#define CAVE_OBJECT     0x1000    /* Mirror, glyph, etc. */
-#define CAVE_UNSAFE     0x2000    /* Might have trap */
-#define CAVE_IN_DETECT  0x4000    /* trap detected area (inner circle only) */
-
-
 /*
  * Special caster ID for project()
  */

diff --git a/src/dungeon.c b/src/dungeon.c
index a585858..0ace5a9 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -26,6 +26,7 @@
 #include "cmd-pet.h"
 #include "floor.h"
 #include "floor-events.h"
+#include "grid.h"
 #include "object-curse.h"
 #include "store.h"
 #include "spells-summon.h"

diff --git a/src/effects.c b/src/effects.c
index e125852..f24ec9c 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -13,6 +13,7 @@
  */
 
 #include "angband.h"
+#include "grid.h"
 #include "mutation.h"
 #include "quest.h"
 #include "avatar.h"

diff --git a/src/grid.h b/src/grid.h
index fd149ef..91989df 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -261,6 +261,37 @@
 }
 
 
+/*
+ * 特殊なマス状態フラグ / Special grid flags
+ */
+#define CAVE_MARK       0x0001    /*!< 現在プレイヤーの記憶に収まっている / memorized feature */
+#define CAVE_GLOW       0x0002    /*!< マス自体が光源を持っている / self-illuminating */
+#define CAVE_ICKY       0x0004    /*!< 生成されたVaultの一部である / part of a vault */
+#define CAVE_ROOM       0x0008    /*!< 生成された部屋の一部である / part of a room */
+#define CAVE_LITE       0x0010    /*!< 現在光に照らされている / lite flag  */
+#define CAVE_VIEW       0x0020    /*!< 現在プレイヤーの視界に収まっている / view flag */
+#define CAVE_TEMP       0x0040    /*!< 光源に関する処理のアルゴリズム用記録フラグ / temp flag */
+#define CAVE_XTRA       0x0080    /*!< 視界に関する処理のアルゴリズム用記録フラグ(update_view()等参照) / misc flag */
+#define CAVE_MNLT       0x0100    /*!< モンスターの光源によって照らされている / Illuminated by monster */
+#define CAVE_MNDK       0x8000    /*!< モンスターの暗源によって暗闇になっている / Darken by monster */
+
+ /* Used only while current_floor_ptr->grid_array generation */
+#define CAVE_FLOOR      0x0200 /*!< フロア属性のあるマス */
+#define CAVE_EXTRA      0x0400
+#define CAVE_INNER      0x0800
+#define CAVE_OUTER      0x1000
+#define CAVE_SOLID      0x2000
+#define CAVE_VAULT      0x4000
+#define CAVE_MASK (CAVE_FLOOR | CAVE_EXTRA | CAVE_INNER | CAVE_OUTER | CAVE_SOLID | CAVE_VAULT)
+
+/* Used only after current_floor_ptr->grid_array generation */
+#define CAVE_KNOWN      0x0200    /* Directly viewed or map detected flag */
+#define CAVE_NOTE       0x0400    /* Flag for delayed visual update (needs note_spot()) */
+#define CAVE_REDRAW     0x0800    /* Flag for delayed visual update (needs lite_spot()) */
+#define CAVE_OBJECT     0x1000    /* Mirror, glyph, etc. */
+#define CAVE_UNSAFE     0x2000    /* Might have trap */
+#define CAVE_IN_DETECT  0x4000    /* trap detected area (inner circle only) */
+
 /* Externs */
 
 extern bool new_player_spot(void);

diff --git a/src/load.c b/src/load.c
index 12bd3b0..7b8f7b7 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -56,6 +56,7 @@
 
 #include "floor-save.h"
 #include "floor.h"
+#include "grid.h"
 
 
 /*

diff --git a/src/monster-status.c b/src/monster-status.c
index f82e891..8c02929 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index caf160e..a0cd4f4 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -40,6 +40,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "object-curse.h"
 #include "quest.h"
 #include "realm-hex.h"

diff --git a/src/mspells2.c b/src/mspells2.c
index 99d6882..de92388 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "quest.h"
 #include "realm-hex.h"
 #include "player-move.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index 56a524b..faddf3c 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "spells-summon.h"
 #include "avatar.h"
 #include "spells-status.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 9642229..a95e12a 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -8,6 +8,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "spells-summon.h"
 #include "artifact.h"
 #include "player-status.h"

diff --git a/src/object2.c b/src/object2.c
index 8b26ec8..662733e 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "grid.h"
 #include "object-boost.h"
 #include "object-hook.h"
 #include "object-curse.h"

diff --git a/src/quest.c b/src/quest.c
index 00a1c4b..e146bf1 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "floor.h"
 #include "floor-events.h"
+#include "grid.h"
 #include "quest.h"
 #include "monsterrace-hook.h"
 #include "monster.h"

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 21931ee..41c6e0e 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -24,6 +24,7 @@
 #include "spells-status.h"
 #include "player-status.h"
 #include "realm-hex.h"
+#include "grid.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 

diff --git a/src/shoot.c b/src/shoot.c
index d49d761..27596bb 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -7,6 +7,7 @@
 #include "player-status.h"
 #include "object-hook.h"
 #include "floor.h"
+#include "grid.h"
 
 #include "shoot.h"
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index b6b34b5..64adc4b 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "floor.h"
 #include "spells-floor.h"
+#include "grid.h"
 
 /*
  * Light up the dungeon using "clairvoyance"

diff --git a/src/spells3.c b/src/spells3.c
index 8a2cd35..04b3e85 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -23,6 +23,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "spells-floor.h"
+#include "grid.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 

diff --git a/src/trap.c b/src/trap.c
index 3f8eae2..56974a1 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -8,6 +8,7 @@
 #include "artifact.h"
 #include "feature.h"
 #include "player-status.h"
+#include "grid.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];
 

diff --git a/src/wizard2.c b/src/wizard2.c
index c395224..10b33b5 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -30,6 +30,7 @@
 
 #include "floor.h"
 #include "floor-save.h"
+#include "grid.h"
 
 #ifdef ALLOW_WIZARD
 

diff --git a/src/xtra2.c b/src/xtra2.c
index 56a9bd4..42d1b6a 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -19,6 +19,7 @@
 #include "objectkind-hook.h"
 #include "sort.h"
 #include "spells-summon.h"
+#include "grid.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "player-move.h"