[Refactor] #37353 feat_locked_door_random, feat_jammed_door_random を grid.c へ移動．

diff --git a/src/defines.h b/src/defines.h
index f1251d3..fa40aab 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -140,16 +140,6 @@
 #define ROW_MAP                 0
 #define COL_MAP                 12
 
-
-#define feat_locked_door_random(DOOR_TYPE) \
-       (feat_door[(DOOR_TYPE)].num_locked ? \
-        feat_door[(DOOR_TYPE)].locked[randint0(feat_door[(DOOR_TYPE)].num_locked)] : feat_none)
-
-#define feat_jammed_door_random(DOOR_TYPE) \
-       (feat_door[(DOOR_TYPE)].num_jammed ? \
-        feat_door[(DOOR_TYPE)].jammed[randint0(feat_door[(DOOR_TYPE)].num_jammed)] : feat_none)
-
-
 /*
  * Bit flags for the *_can_enter() and monster_can_cross_terrain()
  */

diff --git a/src/grid.c b/src/grid.c
index 8752366..34f8c87 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -48,6 +48,14 @@
 #define FAF_NO_DROP     0x02
 #define FAF_CRASH_GLASS 0x04
 
+#define feat_locked_door_random(DOOR_TYPE) \
+       (feat_door[(DOOR_TYPE)].num_locked ? \
+        feat_door[(DOOR_TYPE)].locked[randint0(feat_door[(DOOR_TYPE)].num_locked)] : feat_none)
+
+#define feat_jammed_door_random(DOOR_TYPE) \
+       (feat_door[(DOOR_TYPE)].num_jammed ? \
+        feat_door[(DOOR_TYPE)].jammed[randint0(feat_door[(DOOR_TYPE)].num_jammed)] : feat_none)
+
 /*!
  * @brief 地形状態フラグテーブル /
  * The table of features' actions