From 7fe0006d8a288a9a56fb89c695f02719cf82bd4b Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 11 Feb 2020 03:33:43 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#39912=20=E4=B8=8D=E8=A6=81?=
 =?utf8?q?=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E6=95=B4=E7=90=86=E4=B8=AD=EF=BC=8E?=
 =?utf8?q?=20/=20Refactoring=20unused=20include=20files.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.h          | 22 ++++++++++------------
 src/dungeon.h       |  1 -
 src/floor-town.h    |  5 ++++-
 src/player-class.h  |  3 ++-
 src/player-damage.c |  2 ++
 src/player-move.c   |  1 +
 src/player-move.h   |  1 -
 src/player-status.h |  5 +++--
 src/spells-summon.h |  1 -
 src/world.c         |  1 +
 src/world.h         |  3 ++-
 11 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/bldg.h b/src/bldg.h
index 9c67a6dbc..b91f47fc9 100644
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -16,8 +16,6 @@
  */
 #define ARENA_DEFEATED_OLD_VER (-(MAX_SHORT)) /*<! 旧バージョンの闘技場敗北定義 */
 
-#define MAX_BOUNTY 20
-
 /*
  * A structure to describe a building.
  * From Kamband
@@ -99,10 +97,16 @@ extern MONRACE_IDX today_mon;
 #define BACT_BROKEN_WEAPON          47
 #define MAX_BACT                    48
 
- /*!
-  * @struct arena_type
-  * @brief 闘技場のモンスターエントリー構造体 / A structure type for arena entry
-  */
+extern MONRACE_IDX battle_mon[4];
+extern u32b mon_odds[4];
+extern int battle_odds;
+extern PRICE kakekin;
+extern int sel_monster;
+
+/*!
+ * @struct arena_type
+ * @brief 闘技場のモンスターエントリー構造体 / A structure type for arena entry
+ */
 typedef struct
 {
 	MONRACE_IDX r_idx; /*!< 闘技場のモンスター種族ID(0ならば表彰式) / Monster (0 means victory prizing) */
@@ -110,12 +114,6 @@ typedef struct
 	OBJECT_SUBTYPE_VALUE sval;  /*!< モンスター打倒後に得られるアイテムの小カテゴリID / sval of prize */
 } arena_type;
 
-extern MONRACE_IDX battle_mon[4];
-extern u32b mon_odds[4];
-extern int battle_odds;
-extern PRICE kakekin;
-extern int sel_monster;
-
 extern const arena_type arena_info[MAX_ARENA_MONS + 2];
 extern void update_gambling_monsters(player_type *player_ptr);
 extern void do_cmd_bldg(player_type *player_ptr);
diff --git a/src/dungeon.h b/src/dungeon.h
index d30303e97..dfd44665b 100644
--- a/src/dungeon.h
+++ b/src/dungeon.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "feature.h"
 
 #define DUNGEON_FEAT_PROB_NUM 3
 
diff --git a/src/floor-town.h b/src/floor-town.h
index 8f4fc2ab5..509a25e84 100644
--- a/src/floor-town.h
+++ b/src/floor-town.h
@@ -1,5 +1,8 @@
 #pragma once
-#include "store.h"
+
+struct store_type;
+typedef struct store_type store_type;
+
 
 /*
  * A structure describing a town with
diff --git a/src/player-class.h b/src/player-class.h
index 4a81579fb..ebe90f6f5 100644
--- a/src/player-class.h
+++ b/src/player-class.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "spells.h"
+#include "player-status.h"
 
 /*
  * 職業ごとの選択可能な魔法領域現在の所 bitrh.c でのみ使用。
@@ -127,4 +128,4 @@ extern const player_class class_info[MAX_CLASS];
 
 extern const s32b realm_choices1[];
 extern const s32b realm_choices2[];
-extern const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5];
+extern const concptr player_title[MAX_CLASS][10];
diff --git a/src/player-damage.c b/src/player-damage.c
index 3f7bf8f10..8bc29ea2d 100644
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -4,6 +4,7 @@
 #include "term.h"
 
 #include "avatar.h"
+#include "bldg.h"
 #include "cmd-dump.h"
 #include "realm-song.h"
 #include "floor.h"
@@ -17,6 +18,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-race.h"
 #include "monster-spell.h"
 #include "world.h"
 #include "view-mainwindow.h"
diff --git a/src/player-move.c b/src/player-move.c
index a9afeeb97..4237e29cb 100644
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -155,6 +155,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-race.h"
 #include "player-class.h"
 #include "player-inventory.h"
 #include "player-personality.h"
diff --git a/src/player-move.h b/src/player-move.h
index f4e0a3ff9..b1000b1c2 100644
--- a/src/player-move.h
+++ b/src/player-move.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "floor.h"
 
 extern void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
 extern void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool break_trap);
diff --git a/src/player-status.h b/src/player-status.h
index 6d8f74ca8..34860076a 100644
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -1,6 +1,7 @@
 #pragma once 
-
-#include "floor.h"
+#include "bldg.h"
+struct floor_type;
+typedef struct floor_type floor_type;
 
 /*
  * Most of the "player" information goes here.
diff --git a/src/spells-summon.h b/src/spells-summon.h
index 9c05db8b0..c78a55826 100644
--- a/src/spells-summon.h
+++ b/src/spells-summon.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "monster.h"
 
 /*
  * summon_specificで取り扱われる、召喚の種別定義 / Legal restrictions for "summon_specific()"
diff --git a/src/world.c b/src/world.c
index f034cb96d..465e3a301 100644
--- a/src/world.c
+++ b/src/world.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "world.h"
+#include "player-race.h"
 
 world_type world;
 world_type *current_world_ptr = &world;
diff --git a/src/world.h b/src/world.h
index 4b11821ae..bf17f53eb 100644
--- a/src/world.h
+++ b/src/world.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "bldg.h"
+
+#define MAX_BOUNTY 20
 
 typedef struct {
 
-- 
2.11.0