[Refactor] #37353 feat_* を feature.h へ移動。

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 0f5c40e..8c0565c 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -3,6 +3,7 @@
 #include "util.h"
 
 #include "dungeon-file.h"
+#include "feature.h"
 #include "grid.h"
 #include "quest.h"
 #include "monster.h"

diff --git a/src/dungeon.c b/src/dungeon.c
index 9129298..b0205c6 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -57,6 +57,7 @@
 #include "monster-status.h"
 #include "monsterrace-hook.h"
 #include "floor-save.h"
+#include "feature.h"
 
 #include "view-mainwindow.h"
 #include "dungeon-file.h"

diff --git a/src/externs.h b/src/externs.h
index 2ab5356..e216932 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -335,57 +335,6 @@ extern bool mon_fight;
 extern bool generate_encounter;
 extern concptr screen_dump;
 
-/*** Terrain feature variables ***/
-extern FEAT_IDX feat_none;
-extern FEAT_IDX feat_floor;
-extern FEAT_IDX feat_glyph;
-extern FEAT_IDX feat_explosive_rune;
-extern FEAT_IDX feat_mirror;
-extern FEAT_IDX feat_up_stair;
-extern FEAT_IDX feat_down_stair;
-extern FEAT_IDX feat_entrance;
-extern FEAT_IDX feat_trap_open;
-extern FEAT_IDX feat_trap_armageddon;
-extern FEAT_IDX feat_trap_piranha;
-extern FEAT_IDX feat_rubble;
-extern FEAT_IDX feat_magma_vein;
-extern FEAT_IDX feat_quartz_vein;
-extern FEAT_IDX feat_granite;
-extern FEAT_IDX feat_permanent;
-extern FEAT_IDX feat_glass_floor;
-extern FEAT_IDX feat_glass_wall;
-extern FEAT_IDX feat_permanent_glass_wall;
-extern FEAT_IDX feat_pattern_start;
-extern FEAT_IDX feat_pattern_1;
-extern FEAT_IDX feat_pattern_2;
-extern FEAT_IDX feat_pattern_3;
-extern FEAT_IDX feat_pattern_4;
-extern FEAT_IDX feat_pattern_end;
-extern FEAT_IDX feat_pattern_old;
-extern FEAT_IDX feat_pattern_exit;
-extern FEAT_IDX feat_pattern_corrupted;
-extern FEAT_IDX feat_black_market;
-extern FEAT_IDX feat_town;
-extern FEAT_IDX feat_deep_water;
-extern FEAT_IDX feat_shallow_water;
-extern FEAT_IDX feat_deep_lava;
-extern FEAT_IDX feat_shallow_lava;
-extern FEAT_IDX feat_heavy_cold_zone;
-extern FEAT_IDX feat_cold_zone;
-extern FEAT_IDX feat_heavy_electrical_zone;
-extern FEAT_IDX feat_electrical_zone;
-extern FEAT_IDX feat_deep_acid_puddle;
-extern FEAT_IDX feat_shallow_acid_puddle;
-extern FEAT_IDX feat_deep_poisonous_puddle;
-extern FEAT_IDX feat_shallow_poisonous_puddle;
-extern FEAT_IDX feat_dirt;
-extern FEAT_IDX feat_grass;
-extern FEAT_IDX feat_flower;
-extern FEAT_IDX feat_brake;
-extern FEAT_IDX feat_tree;
-extern FEAT_IDX feat_mountain;
-extern FEAT_IDX feat_swamp;
-extern FEAT_IDX feat_undetected;
 
 extern DEPTH *max_dlv;
 extern FEAT_IDX feat_wall_outer;

diff --git a/src/feature.c b/src/feature.c
index 4a8f6dd..dc8292f 100644 (file)
--- a/src/feature.c
+++ b/src/feature.c
@@ -1,6 +1,85 @@
 #include "angband.h"
 #include "feature.h"
 
+/*** Terrain feature variables ***/
+
+/* Nothing */
+FEAT_IDX feat_none;
+
+/* Floor */
+FEAT_IDX feat_floor;
+
+/* Objects */
+FEAT_IDX feat_glyph;
+FEAT_IDX feat_explosive_rune;
+FEAT_IDX feat_mirror;
+
+/* Stairs */
+FEAT_IDX feat_up_stair;
+FEAT_IDX feat_down_stair;
+FEAT_IDX feat_entrance;
+
+/* Special traps */
+FEAT_IDX feat_trap_open;
+FEAT_IDX feat_trap_armageddon;
+FEAT_IDX feat_trap_piranha;
+
+/* Rubble */
+FEAT_IDX feat_rubble;
+
+/* Seams */
+FEAT_IDX feat_magma_vein;
+FEAT_IDX feat_quartz_vein;
+
+/* Walls */
+FEAT_IDX feat_granite;
+FEAT_IDX feat_permanent;
+
+/* Glass floor */
+FEAT_IDX feat_glass_floor;
+
+/* Glass walls */
+FEAT_IDX feat_glass_wall;
+FEAT_IDX feat_permanent_glass_wall;
+
+/* Pattern */
+FEAT_IDX feat_pattern_start;
+FEAT_IDX feat_pattern_1;
+FEAT_IDX feat_pattern_2;
+FEAT_IDX feat_pattern_3;
+FEAT_IDX feat_pattern_4;
+FEAT_IDX feat_pattern_end;
+FEAT_IDX feat_pattern_old;
+FEAT_IDX feat_pattern_exit;
+FEAT_IDX feat_pattern_corrupted;
+
+/* Various */
+FEAT_IDX feat_black_market;
+FEAT_IDX feat_town;
+
+/* Terrains */
+FEAT_IDX feat_deep_water;
+FEAT_IDX feat_shallow_water;
+FEAT_IDX feat_deep_lava;
+FEAT_IDX feat_shallow_lava;
+FEAT_IDX feat_heavy_cold_zone;
+FEAT_IDX feat_cold_zone;
+FEAT_IDX feat_heavy_electrical_zone;
+FEAT_IDX feat_electrical_zone;
+FEAT_IDX feat_deep_acid_puddle;
+FEAT_IDX feat_shallow_acid_puddle;
+FEAT_IDX feat_deep_poisonous_puddle;
+FEAT_IDX feat_shallow_poisonous_puddle;
+FEAT_IDX feat_dirt;
+FEAT_IDX feat_grass;
+FEAT_IDX feat_flower;
+FEAT_IDX feat_brake;
+FEAT_IDX feat_tree;
+FEAT_IDX feat_mountain;
+FEAT_IDX feat_swamp;
+
+/* Unknown grid (not detected) */
+FEAT_IDX feat_undetected;
 
 /*!
  * @brief 地形が罠持ちであるかの判定を行う。 / Return TRUE if the given feature is a trap

diff --git a/src/feature.h b/src/feature.h
index 1180ef8..07791f7 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -1,3 +1,55 @@
 #pragma once
 extern bool is_closed_door(FEAT_IDX feat);
 extern bool is_trap(FEAT_IDX feat);
+
+/*** Terrain feature variables ***/
+extern FEAT_IDX feat_none;
+extern FEAT_IDX feat_floor;
+extern FEAT_IDX feat_glyph;
+extern FEAT_IDX feat_explosive_rune;
+extern FEAT_IDX feat_mirror;
+extern FEAT_IDX feat_up_stair;
+extern FEAT_IDX feat_down_stair;
+extern FEAT_IDX feat_entrance;
+extern FEAT_IDX feat_trap_open;
+extern FEAT_IDX feat_trap_armageddon;
+extern FEAT_IDX feat_trap_piranha;
+extern FEAT_IDX feat_rubble;
+extern FEAT_IDX feat_magma_vein;
+extern FEAT_IDX feat_quartz_vein;
+extern FEAT_IDX feat_granite;
+extern FEAT_IDX feat_permanent;
+extern FEAT_IDX feat_glass_floor;
+extern FEAT_IDX feat_glass_wall;
+extern FEAT_IDX feat_permanent_glass_wall;
+extern FEAT_IDX feat_pattern_start;
+extern FEAT_IDX feat_pattern_1;
+extern FEAT_IDX feat_pattern_2;
+extern FEAT_IDX feat_pattern_3;
+extern FEAT_IDX feat_pattern_4;
+extern FEAT_IDX feat_pattern_end;
+extern FEAT_IDX feat_pattern_old;
+extern FEAT_IDX feat_pattern_exit;
+extern FEAT_IDX feat_pattern_corrupted;
+extern FEAT_IDX feat_black_market;
+extern FEAT_IDX feat_town;
+extern FEAT_IDX feat_deep_water;
+extern FEAT_IDX feat_shallow_water;
+extern FEAT_IDX feat_deep_lava;
+extern FEAT_IDX feat_shallow_lava;
+extern FEAT_IDX feat_heavy_cold_zone;
+extern FEAT_IDX feat_cold_zone;
+extern FEAT_IDX feat_heavy_electrical_zone;
+extern FEAT_IDX feat_electrical_zone;
+extern FEAT_IDX feat_deep_acid_puddle;
+extern FEAT_IDX feat_shallow_acid_puddle;
+extern FEAT_IDX feat_deep_poisonous_puddle;
+extern FEAT_IDX feat_shallow_poisonous_puddle;
+extern FEAT_IDX feat_dirt;
+extern FEAT_IDX feat_grass;
+extern FEAT_IDX feat_flower;
+extern FEAT_IDX feat_brake;
+extern FEAT_IDX feat_tree;
+extern FEAT_IDX feat_mountain;
+extern FEAT_IDX feat_swamp;
+extern FEAT_IDX feat_undetected;

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 9bfe9bf..5bf7591 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -99,7 +99,6 @@
 #include "angband.h"
 #include "util.h"
 
-#include "floor-generate.h"
 #include "grid.h"
 #include "rooms.h"
 #include "floor.h"
@@ -107,6 +106,8 @@
 #include "floor-streams.h"
 #include "floor-generate.h"
 #include "floor-events.h"
+#include "floor-generate.h"
+#include "feature.h"
 #include "trap.h"
 #include "monster.h"
 #include "quest.h"
@@ -115,6 +116,7 @@
 #include "monster-status.h"
 #include "dungeon-file.h"
 #include "init.h"
+#include "feature.h"
 
 int dun_tun_rnd; 
 int dun_tun_chg;

diff --git a/src/floor-generate.h b/src/floor-generate.h
index 940494e..83590f8 100644 (file)
--- a/src/floor-generate.h
+++ b/src/floor-generate.h
@@ -8,8 +8,6 @@
  * \95s\96¾(\95Ï\8bð\94Ø\93{\83X\83^\83b\83t\81H)
  */
 
-#define ALLOW_CAVERNS_AND_LAKES
-
 #define SAFE_MAX_ATTEMPTS 5000 /*!< \90¶\90¬\8f\88\97\9d\8aî\96{\8e\8e\8ds\89ñ\90\94 */
 
 

diff --git a/src/floor-save.c b/src/floor-save.c
index c51a3c1..02bafa4 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -16,6 +16,7 @@
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-generate.h"
+#include "feature.h"
 #include "grid.h"
 #include "monster.h"
 #include "quest.h"

diff --git a/src/init.c b/src/init.c
index 10c59d7..d814689 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -43,6 +43,7 @@
 #include "wild.h"
 #include "dungeon-file.h"
 #include "files.h"
+#include "feature.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/load.c b/src/load.c
index 5f994c6..7a8a089 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -43,6 +43,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "feature.h"
 #include "floor-generate.h"
 #include "trap.h"
 #include "mutation.h"

diff --git a/src/player-status.c b/src/player-status.c
index 8ab8303..3899496 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5,6 +5,7 @@
 #include "player-status.h"
 #include "floor.h"
 #include "floor-events.h"
+#include "feature.h"
 #include "artifact.h"
 #include "avatar.h"
 #include "spells-status.h"

diff --git a/src/quest.c b/src/quest.c
index a4a8b6f..21488a5 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -10,6 +10,7 @@
 #include "monster.h"
 #include "player-status.h"
 #include "artifact.h"
+#include "feature.h"
 
 
 /*!

diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index 9688e90..b06a5c9 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -9,6 +9,7 @@
 #include "monsterrace-hook.h"
 #include "sort.h"
 #include "floor.h"
+#include "feature.h"
 
 
 

diff --git a/src/rooms-trap.c b/src/rooms-trap.c
index 3c807ea..3fcfd3b 100644 (file)
--- a/src/rooms-trap.c
+++ b/src/rooms-trap.c
@@ -5,6 +5,7 @@
 #include "floor-generate.h"
 #include "rooms.h"
 #include "floor.h"
+#include "feature.h"
 
 
 /*!

diff --git a/src/rooms.c b/src/rooms.c
index 02bcb80..060ffd5 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -39,6 +39,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "feature.h"
 #include "floor.h"
 #include "floor-generate.h"
 #include "grid.h"

diff --git a/src/rooms.h b/src/rooms.h
index e803c7b..3bd220d 100644 (file)
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -9,6 +9,8 @@
  * are included in all such copies.  Other copyrights may also apply.<br
  */
 
+#define ALLOW_CAVERNS_AND_LAKES
+
 #define DUN_ROOMS_MAX  40 /*!< 部屋生成処理の最大試行数 / Number of rooms to attempt (was 50) */
 
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 1ec0341..4d635e2 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -8,6 +8,7 @@
 #include "cmd-basic.h"
 #include "floor-save.h"
 #include "player-effects.h"
+#include "feature.h"
 
 /*
  * Light up the dungeon using "clairvoyance"

diff --git a/src/spells2.c b/src/spells2.c
index fb62491..8a6b57d 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -38,6 +38,7 @@
 #include "player-effects.h"
 
 #include "floor-events.h"
+#include "feature.h"
 
 /*!
  * @brief プレイヤー周辺の地形を感知する

diff --git a/src/variable.c b/src/variable.c
index ef0a708..a176f52 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -771,85 +771,6 @@ bool generate_encounter;
 
 concptr screen_dump = NULL;
 
-/*** Terrain feature variables ***/
-
-/* Nothing */
-FEAT_IDX feat_none;
-
-/* Floor */
-FEAT_IDX feat_floor;
-
-/* Objects */
-FEAT_IDX feat_glyph;
-FEAT_IDX feat_explosive_rune;
-FEAT_IDX feat_mirror;
-
-/* Stairs */
-FEAT_IDX feat_up_stair;
-FEAT_IDX feat_down_stair;
-FEAT_IDX feat_entrance;
-
-/* Special traps */
-FEAT_IDX feat_trap_open;
-FEAT_IDX feat_trap_armageddon;
-FEAT_IDX feat_trap_piranha;
-
-/* Rubble */
-FEAT_IDX feat_rubble;
-
-/* Seams */
-FEAT_IDX feat_magma_vein;
-FEAT_IDX feat_quartz_vein;
-
-/* Walls */
-FEAT_IDX feat_granite;
-FEAT_IDX feat_permanent;
-
-/* Glass floor */
-FEAT_IDX feat_glass_floor;
-
-/* Glass walls */
-FEAT_IDX feat_glass_wall;
-FEAT_IDX feat_permanent_glass_wall;
-
-/* Pattern */
-FEAT_IDX feat_pattern_start;
-FEAT_IDX feat_pattern_1;
-FEAT_IDX feat_pattern_2;
-FEAT_IDX feat_pattern_3;
-FEAT_IDX feat_pattern_4;
-FEAT_IDX feat_pattern_end;
-FEAT_IDX feat_pattern_old;
-FEAT_IDX feat_pattern_exit;
-FEAT_IDX feat_pattern_corrupted;
-
-/* Various */
-FEAT_IDX feat_black_market;
-FEAT_IDX feat_town;
-
-/* Terrains */
-FEAT_IDX feat_deep_water;
-FEAT_IDX feat_shallow_water;
-FEAT_IDX feat_deep_lava;
-FEAT_IDX feat_shallow_lava;
-FEAT_IDX feat_heavy_cold_zone;
-FEAT_IDX feat_cold_zone;
-FEAT_IDX feat_heavy_electrical_zone;
-FEAT_IDX feat_electrical_zone;
-FEAT_IDX feat_deep_acid_puddle;
-FEAT_IDX feat_shallow_acid_puddle;
-FEAT_IDX feat_deep_poisonous_puddle;
-FEAT_IDX feat_shallow_poisonous_puddle;
-FEAT_IDX feat_dirt;
-FEAT_IDX feat_grass;
-FEAT_IDX feat_flower;
-FEAT_IDX feat_brake;
-FEAT_IDX feat_tree;
-FEAT_IDX feat_mountain;
-FEAT_IDX feat_swamp;
-
-/* Unknown grid (not detected) */
-FEAT_IDX feat_undetected;
 
 /*
  * Which dungeon ?

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 8dccb36..ae95eba 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -27,6 +27,7 @@
 
 #include "grid.h"
 #include "floor.h"
+#include "feature.h"
 
 static int feat_priority; /*!< マップ縮小表示時に表示すべき地形の優先度を保管する */
 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */

diff --git a/src/wild.c b/src/wild.c
index d92a81c..91f4691 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -25,6 +25,7 @@
 #include "quest.h"
 #include "dungeon-file.h"
 #include "files.h"
+#include "feature.h"
 
  /*
   * Wilderness

diff --git a/src/xtra2.c b/src/xtra2.c
index ab40660..3c0c5fb 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -30,6 +30,7 @@
 #include "player-status.h"
 #include "monster-status.h"
 #include "view-mainwindow.h"
+#include "feature.h"
 
 /*!
  * @brief コンソール上におけるマップ表示の左上位置を返す /