[Refactor] #37353 world_type を world.c/h へ移動。

diff --git a/src/autopick.c b/src/autopick.c
index ca3a3a2..587c767 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -24,6 +24,7 @@
 
 #include "files.h"
 #include "floor.h"
+#include "world.h"
 
 #define MAX_LINELEN 1024
 

diff --git a/src/birth.c b/src/birth.c
index 38a4ab3..9fb9d98 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -32,6 +32,7 @@
 #include "files.h"
 #include "birth.h"
 #include "player-skill.h"
+#include "world.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 6fc1d79..4e42466 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -12,6 +12,7 @@
 #include "dungeon.h"
 #include "floor.h"
 #include "bldg.h"
+#include "world.h"
 
 dungeon_grid letter[255];
 

diff --git a/src/externs.h b/src/externs.h
index bd1be26..5fb569d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -223,7 +223,6 @@ extern const char angband_term_name[8][16];
 extern byte angband_color_table[256][4];
 extern const concptr angband_sound_name[SOUND_MAX];
 extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
-extern world_type *current_world_ptr;
 extern FLOOR_IDX max_floor_id;
 extern u32b saved_floor_file_sign;
 extern TOWN_IDX max_towns;

diff --git a/src/floor-save.c b/src/floor-save.c
index 6809d82..4acf4d2 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -30,6 +30,7 @@
 #include "cmd-basic.h"
 #include "files.h"
 #include "player-effects.h"
+#include "world.h"
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */
 static u32b change_floor_mode;  /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */

diff --git a/src/load.c b/src/load.c
index 53cbec1..6c212ab 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -67,6 +67,7 @@
 #include "dungeon-file.h"
 #include "files.h"
 #include "player-skill.h"
+#include "world.h"
 
 
 /*

diff --git a/src/melee1.c b/src/melee1.c
index 018b73c..aec92c2 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -37,6 +37,7 @@
 #include "player-damage.h"
 #include "player-status.h"
 #include "view-mainwindow.h"
+#include "world.h"
 
 
  /*!

diff --git a/src/monster-status.c b/src/monster-status.c
index 4afe04f..0fe0f4c 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -16,6 +16,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "view-mainwindow.h"
+#include "world.h"
 
 
 /*!

diff --git a/src/monster1.c b/src/monster1.c
index 734e115..5888d17 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -28,6 +28,7 @@
 #include "wild.h"
 #include "spells.h"
 #include "dungeon.h"
+#include "world.h"
 
 
 /*

diff --git a/src/monster2.c b/src/monster2.c
index 0bc5a70..28084b6 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -31,6 +31,7 @@
 #include "monster-spell.h"
 #include "files.h"
 #include "view-mainwindow.h"
+#include "world.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */

diff --git a/src/mspells1.c b/src/mspells1.c
index d7032cb..1ba87f4 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -52,6 +52,7 @@
 #include "monster.h"
 #include "monster-spell.h"
 #include "spells.h"
+#include "world.h"
 
 
 /*!

diff --git a/src/mspells2.c b/src/mspells2.c
index eca46bf..f803487 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -25,6 +25,7 @@
 #include "monster-spell.h"
 #include "spells.h"
 #include "dungeon.h"
+#include "world.h"
 
 /*!
  * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

diff --git a/src/mspells4.c b/src/mspells4.c
index 4185194..409ae5b 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -21,6 +21,7 @@
 #include "spells.h"
 #include "melee.h"
 #include "player-effects.h"
+#include "world.h"
 
 
 

diff --git a/src/object-hook.c b/src/object-hook.c
index bef3585..b0ba633 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -7,6 +7,7 @@
 #include "artifact.h"
 #include "player-skill.h"
 #include "quest.h"
+#include "world.h"
 
 /*!
 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/

diff --git a/src/player-damage.c b/src/player-damage.c
index 8568d05..ac2ba26 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -9,6 +9,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "monster-spell.h"
+#include "world.h"
 
 
 /*!

diff --git a/src/player-effects.c b/src/player-effects.c
index 3352e86..7f52d03 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -36,6 +36,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "monster-spell.h"
+#include "world.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/player-move.c b/src/player-move.c
index 4c9682a..ef21fcd 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -163,6 +163,7 @@
 #include "spells.h"
 #include "cmd-basic.h"
 #include "view-mainwindow.h"
+#include "world.h"
 
 
 

diff --git a/src/quest.c b/src/quest.c
index 8a0bd6e..998e25a 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -11,6 +11,7 @@
 #include "player-status.h"
 #include "artifact.h"
 #include "feature.h"
+#include "world.h"
 
 /*
  * Quest info

diff --git a/src/report.c b/src/report.c
index d02434f..bef599e 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -12,6 +12,7 @@
 #include "floor.h"
 #include "player-status.h"
 #include "files.h"
+#include "world.h"
 
 #ifdef WORLD_SCORE
 

diff --git a/src/save.c b/src/save.c
index ad2717e..f7b0250 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -23,7 +23,7 @@
 #include "floor-events.h"
 #include "floor-save.h"
 #include "files.h"
-
+#include "world.h"
 
 
 /*

diff --git a/src/scores.c b/src/scores.c
index 1832acd..d347bb3 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -17,6 +17,7 @@
 #include "files.h"
 #include "scores.h"
 #include "floor.h"
+#include "world.h"
 
 /*!
  * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file

diff --git a/src/spells-world.c b/src/spells-world.c
index bf0868e..8a5b80d 100644 (file)
--- a/src/spells-world.c
+++ b/src/spells-world.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "util.h"
+#include "world.h"
 
 /*!
  * @brief プレイ日数を変更する / Set gametime.

diff --git a/src/spells3.c b/src/spells3.c
index 795dae9..38a5f6b 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -42,6 +42,7 @@
 #include "view-mainwindow.h"
 #include "mind.h"
 #include "wild.h"
+#include "world.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */

diff --git a/src/store.c b/src/store.c
index c9ed1ca..c97a53a 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -31,6 +31,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "mind.h"
+#include "world.h"
 
 #define MIN_STOCK 12
 

diff --git a/src/trap.c b/src/trap.c
index 2af2dbd..68b0b4c 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -17,6 +17,7 @@
 #include "init.h"
 #include "files.h"
 #include "dungeon.h"
+#include "world.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];
 

diff --git a/src/types.h b/src/types.h
index 213c583..732e3a0 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1922,17 +1922,3 @@ typedef struct {
        int type;
        concptr name;
 } dragonbreath_type;
-
-typedef struct {
-       POSITION max_wild_x; /*!< Maximum size of the wilderness */
-       POSITION max_wild_y; /*!< Maximum size of the wilderness */
-       GAME_TURN game_turn;                    /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
-       GAME_TURN game_turn_limit;              /*!< game_turnの最大値 / Limit of game_turn */
-       GAME_TURN dungeon_turn;                 /*!< NASTY生成の計算に関わる内部ターン値 / Game current_world_ptr->game_turn in dungeon */
-       GAME_TURN dungeon_turn_limit;   /*!< dungeon_turnの最大値 / Limit of game_turn in dungeon */
-       MONSTER_IDX timewalk_m_idx;     /*!< 現在時間停止を行っているモンスターのID */
-
-       MONRACE_IDX bounty_r_idx[MAX_KUBI];
-
-       u32b play_time; /*!< 実プレイ時間 */
-} world_type;

diff --git a/src/util.c b/src/util.c
index f681b3a..5913bf0 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -16,6 +16,7 @@
 #include "view-mainwindow.h"
 #include "quest.h"
 #include "floor.h"
+#include "world.h"
 
 
 static int num_more = 0;

diff --git a/src/variable.c b/src/variable.c
index 2954e06..6c76f0c 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -435,9 +435,6 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
  */
 FLOOR_IDX max_floor_id;
 
-world_type world;
-world_type *current_world_ptr = &world;
-
 /*
  * Sign for current process used in temporal files.
  * Actually it is the start time of current process.

diff --git a/src/world.c b/src/world.c
index a58882c..0d7d5f1 100644 (file)
--- a/src/world.c
+++ b/src/world.c
@@ -1,4 +1,8 @@
 #include "angband.h"
+#include "world.h"
+
+world_type world;
+world_type *current_world_ptr = &world;
 
 /*!
  * @brief ゲーム時間が日中かどうかを返す /

diff --git a/src/world.h b/src/world.h
index 96ac405..44981c0 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -1,2 +1,19 @@
-extern bool is_daytime(void);
+#pragma once
+
+typedef struct {
+       POSITION max_wild_x; /*!< Maximum size of the wilderness */
+       POSITION max_wild_y; /*!< Maximum size of the wilderness */
+       GAME_TURN game_turn;                    /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
+       GAME_TURN game_turn_limit;              /*!< game_turnの最大値 / Limit of game_turn */
+       GAME_TURN dungeon_turn;                 /*!< NASTY生成の計算に関わる内部ターン値 / Game current_world_ptr->game_turn in dungeon */
+       GAME_TURN dungeon_turn_limit;   /*!< dungeon_turnの最大値 / Limit of game_turn in dungeon */
+       MONSTER_IDX timewalk_m_idx;     /*!< 現在時間停止を行っているモンスターのID */
+
+       MONRACE_IDX bounty_r_idx[MAX_KUBI];
+
+       u32b play_time; /*!< 実プレイ時間 */
+} world_type;
+
+extern bool is_daytime(void);
 extern void extract_day_hour_min(int *day, int *hour, int *min);
+extern world_type *current_world_ptr;
\ No newline at end of file