[Refactor] #37353 CONVERT_TYPE を grid.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 698e3c7..fae5d1e 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -271,17 +271,6 @@
         feat_door[(DOOR_TYPE)].jammed[randint0(feat_door[(DOOR_TYPE)].num_jammed)] : feat_none)
 
 
-
-/* Types of conversions */
-#define CONVERT_TYPE_FLOOR   0
-#define CONVERT_TYPE_WALL    1
-#define CONVERT_TYPE_INNER   2
-#define CONVERT_TYPE_OUTER   3
-#define CONVERT_TYPE_SOLID   4
-#define CONVERT_TYPE_STREAM1 5
-#define CONVERT_TYPE_STREAM2 6
-
-
 /*
  * Bit flags for the *_can_enter() and monster_can_cross_terrain()
  */

diff --git a/src/grid.c b/src/grid.c
index 0a86a8c..7b9e49e 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -1965,7 +1965,6 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
        }
 }
 
-
 FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat)
 {
        feature_type *f_ptr = &f_info[newfeat];

diff --git a/src/grid.h b/src/grid.h
index ca9cd99..aadadf6 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -357,6 +357,15 @@ typedef struct
 #define CAVE_UNSAFE     0x2000    /* Might have trap */
 #define CAVE_IN_DETECT  0x4000    /* trap detected area (inner circle only) */
 
+/* Types of conversions */
+#define CONVERT_TYPE_FLOOR   0
+#define CONVERT_TYPE_WALL    1
+#define CONVERT_TYPE_INNER   2
+#define CONVERT_TYPE_OUTER   3
+#define CONVERT_TYPE_SOLID   4
+#define CONVERT_TYPE_STREAM1 5
+#define CONVERT_TYPE_STREAM2 6
+
 /* Externs */
 
 extern bool new_player_spot(void);