[Refactor] #40413 Moved tmp_pos from util.c/h to grid.c/h

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 34ec1e8..d29d678 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -47,17 +47,19 @@
 
 #define MONSTER_FLOW_DEPTH 32 /*!< 敵のプレイヤーに対する移動道のりの最大値(この値以上は処理を打ち切る) / OPTION: Maximum flow depth when using "MONSTER_FLOW" */
 
- /*
-  * Feature action flags
-  */
+/*
+ * Feature action flags
+ */
 #define FAF_DESTROY     0x01
 #define FAF_NO_DROP     0x02
 #define FAF_CRASH_GLASS 0x04
 
-  /*!
-   * @brief 地形状態フラグテーブル /
-   * The table of features' actions
-   */
+pos_list tmp_pos;
+
+/*!
+ * @brief 地形状態フラグテーブル /
+ * The table of features' actions
+ */
 static const byte feature_action_flags[FF_FLAG_MAX] =
 {
        0, /* LOS */

diff --git a/src/grid/grid.h b/src/grid/grid.h
index d571d40..31c5931 100644 (file)
--- a/src/grid/grid.h
+++ b/src/grid/grid.h
@@ -153,10 +153,6 @@ typedef struct
 #define CONVERT_TYPE_STREAM1 5
 #define CONVERT_TYPE_STREAM2 6
 
-/* Externs */
-
-extern bool new_player_spot(player_type *creature_ptr);
-
 /* Types of doors */
 #define DOOR_DEFAULT    -1
 #define DOOR_DOOR        0
@@ -165,14 +161,15 @@ extern bool new_player_spot(player_type *creature_ptr);
 
 #define MAX_DOOR_TYPES   3
 
-extern void place_bound_perm_wall(player_type *player_ptr, grid_type *g_ptr);
+extern bool new_player_spot(player_type *creature_ptr);
+extern pos_list tmp_pos;
 
+extern void place_bound_perm_wall(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_known_trap(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_hidden_door(player_type *player_ptr, grid_type *g_ptr);
 extern bool is_mirror_grid(grid_type *g_ptr);
 extern bool is_glyph_grid(grid_type *g_ptr);
 extern bool is_explosive_rune_grid(grid_type *g_ptr);
-
 extern bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 mode);
 
 /*!

diff --git a/src/util/util.c b/src/util/util.c
index 21d94bb..7d9f2f1 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -46,8 +46,6 @@
 #include "view/display-messages.h"
 #include "world/world.h"
 
-pos_list tmp_pos;
-
 /*
  * Add a series of keypresses to the "queue".
  *

diff --git a/src/util/util.h b/src/util/util.h
index 81c43d4..cfd5c4f 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -41,8 +41,6 @@ struct alloc_entry
        u16b total;             /* Unused for now */
 };
 
-extern pos_list tmp_pos;
-
 /*
  * OPTION: Maximum number of messages to remember (see "io.c")
  * Default: assume maximal memorization of 2048 total messages