[Refactor] #37353 feature_* 変数のいくつかを feature.h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 8cfb4a7..206d3ae 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -251,10 +251,6 @@ extern concptr screen_dump;
 
 
 extern DEPTH *max_dlv;
-extern FEAT_IDX feat_wall_outer;
-extern FEAT_IDX feat_wall_inner;
-extern FEAT_IDX feat_wall_solid;
-extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 extern COMMAND_CODE now_message;
 extern bool use_menu;
 

diff --git a/src/feature.c b/src/feature.c
index e35d45d..65f9208 100644 (file)
--- a/src/feature.c
+++ b/src/feature.c
@@ -88,6 +88,12 @@ FEAT_IDX feat_swamp;
 /* Unknown grid (not detected) */
 FEAT_IDX feat_undetected;
 
+FEAT_IDX feat_wall_outer;
+FEAT_IDX feat_wall_inner;
+FEAT_IDX feat_wall_solid;
+FEAT_IDX feat_ground_type[100], feat_wall_type[100];
+
+
 /*!
  * @brief 地形が罠持ちであるかの判定を行う。 / Return TRUE if the given feature is a trap
  * @param feat 地形情報のID

diff --git a/src/feature.h b/src/feature.h
index 4086e05..f7e5817 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -111,3 +111,8 @@ extern FEAT_IDX feat_tree;
 extern FEAT_IDX feat_mountain;
 extern FEAT_IDX feat_swamp;
 extern FEAT_IDX feat_undetected;
+
+extern FEAT_IDX feat_wall_outer;
+extern FEAT_IDX feat_wall_inner;
+extern FEAT_IDX feat_wall_solid;
+extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];

diff --git a/src/variable.c b/src/variable.c
index 56ef45a..b8d6dda 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -557,11 +557,6 @@ concptr screen_dump = NULL;
  */
 DEPTH *max_dlv;
 
-FEAT_IDX feat_wall_outer;
-FEAT_IDX feat_wall_inner;
-FEAT_IDX feat_wall_solid;
-FEAT_IDX feat_ground_type[100], feat_wall_type[100];
-
 COMMAND_CODE now_message;
 bool use_menu;