[Refactor] #37353 Adjusted inclusion relationship in birth/, cmd-building/ and cmd-io/

diff --git a/src/birth/birth-util.c b/src/birth/birth-util.c
index 093aa80..22456c5 100644 (file)
--- a/src/birth/birth-util.c
+++ b/src/birth/birth-util.c
@@ -1,5 +1,4 @@
-#include "system/angband.h"
-#include "birth/birth-util.h"
+#include "birth/birth-util.h"
 #include "cmd-io/cmd-gameoption.h"
 #include "core/show-file.h"
 #include "main/sound-of-music.h"

diff --git a/src/birth/birth-util.h b/src/birth/birth-util.h
index b3ded32..fbcc6f6 100644 (file)
--- a/src/birth/birth-util.h
+++ b/src/birth/birth-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 typedef enum birth_kind
 {
        BK_REALM,

diff --git a/src/birth/history-generator.c b/src/birth/history-generator.c
index ff8191a..d11edc8 100644 (file)
--- a/src/birth/history-generator.c
+++ b/src/birth/history-generator.c
@@ -1,5 +1,4 @@
-#include "system/angband.h"
-#include "birth/history-generator.h"
+#include "birth/history-generator.h"
 #include "birth/history.h"
 #include "player/player-race-types.h"
 #include "util/buffer-shaper.h"

diff --git a/src/birth/history-generator.h b/src/birth/history-generator.h
index e90b25d..b813065 100644 (file)
--- a/src/birth/history-generator.h
+++ b/src/birth/history-generator.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 void get_history(player_type* creature_ptr);

diff --git a/src/birth/history.c b/src/birth/history.c
index 38cb924..9d97cf8 100644 (file)
--- a/src/birth/history.c
+++ b/src/birth/history.c
@@ -1,6 +1,10 @@
-#include "system/angband.h"
-#include "birth/history.h"
+/*!
+ * @brief 生い立ちメッセージテーブル / Forward declare
+ * @date 2002/01/12
+ * @author mogami
+ */
 
+#include "birth/history.h"
 
 /*!
 * 生い立ちテーブルの定義 / Background information (see below)\n

diff --git a/src/birth/history.h b/src/birth/history.h
index dcb64b0..f82d005 100644 (file)
--- a/src/birth/history.h
+++ b/src/birth/history.h
@@ -1,21 +1,16 @@
-
-/*!
-* 生い立ちメッセージテーブル / Forward declare
-*/
-typedef struct hist_type hist_type;
+#include "system/angband.h"
 
 /*!
 * 生い立ちメッセージテーブルの構造体定義 / Player background information
 */
-struct hist_type
-{
+typedef struct hist_type {
        concptr info;                       /*!> メッセージ本文 / Textual History */
 
        byte roll;                          /*!> 確率の重み / Frequency of this entry */
        byte chart;                         /*!> 生い立ちメッセージの流れを示すチャートID / Chart index */
        byte next;                          /*!> 次のチャートID */
        byte bonus;                         /*!> メッセージに伴う社会的地位の変化量(50が基準値) / Social Class Bonus + 50 */
-};
+} hist_type;
 
 struct hist_type;
 extern hist_type bg[];

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index dbed3e7..1e844a8 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -11,7 +11,6 @@
  * Changed for ZAngband by Robert Ruehlmann
  */
 
-#include "system/angband.h"
 #include "cmd-building/cmd-building.h"
 #include "cmd-action/cmd-spell.h"
 #include "cmd-io/cmd-dump.h"

diff --git a/src/cmd-building/cmd-building.h b/src/cmd-building/cmd-building.h
index 358f30c..cc0db6d 100644 (file)
--- a/src/cmd-building/cmd-building.h
+++ b/src/cmd-building/cmd-building.h
@@ -1,10 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
 #include "object/tval-types.h"
-#include "realm/realm-names-table.h"
-#include "player/player-race.h"
-#include "player/race-info-table.h"
-#include "player/player-class.h"
 
 #define BUILDING_NON_MEMBER 0 /*!< 不明(現在未使用) */
 #define BUILDING_MEMBER     1 /*!< 不明(現在未使用) */
@@ -28,11 +25,10 @@ extern int sel_monster;
  * @struct arena_type
  * @brief 闘技場のモンスターエントリー構造体 / A structure type for arena entry
  */
-typedef struct
-{
+typedef struct arena_type {
        MONRACE_IDX r_idx; /*!< 闘技場のモンスター種族ID(0ならば表彰式) / Monster (0 means victory prizing) */
        tval_type tval;  /*!< モンスター打倒後に得られるアイテムの大カテゴリID / tval of prize (0 means no prize) */
        OBJECT_SUBTYPE_VALUE sval;  /*!< モンスター打倒後に得られるアイテムの小カテゴリID / sval of prize */
 } arena_type;
 
-extern void do_cmd_building(player_type *player_ptr);
+void do_cmd_building(player_type *player_ptr);

diff --git a/src/cmd-io/diary-subtitle-table.c b/src/cmd-io/diary-subtitle-table.c
index 1f88f72..3270e57 100644 (file)
--- a/src/cmd-io/diary-subtitle-table.c
+++ b/src/cmd-io/diary-subtitle-table.c
@@ -4,7 +4,6 @@
  * @author Hourier
  */
 
-#include "system/angband.h"
 #include "cmd-io/diary-subtitle-table.h"
 
 concptr subtitle[MAX_SUBTITLE] = {

diff --git a/src/cmd-io/diary-subtitle-table.h b/src/cmd-io/diary-subtitle-table.h
index e347893..a98477f 100644 (file)
--- a/src/cmd-io/diary-subtitle-table.h
+++ b/src/cmd-io/diary-subtitle-table.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 #define MAX_SUBTITLE 33
 
 extern concptr subtitle[MAX_SUBTITLE];

diff --git a/src/cmd-io/feeling-table.c b/src/cmd-io/feeling-table.c
index 453b8df..9c68608 100644 (file)
--- a/src/cmd-io/feeling-table.c
+++ b/src/cmd-io/feeling-table.c
@@ -4,7 +4,6 @@
  * @author Hourier
  */
 
-#include "system/angband.h"
 #include "cmd-io/feeling-table.h"
 
 concptr do_cmd_feeling_text[MAX_FEELING_TEXT] =

diff --git a/src/cmd-io/feeling-table.h b/src/cmd-io/feeling-table.h
index 2b2982c..5a504f7 100644 (file)
--- a/src/cmd-io/feeling-table.h
+++ b/src/cmd-io/feeling-table.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 #define MAX_FEELING_TEXT 11
 
 extern concptr do_cmd_feeling_text[MAX_FEELING_TEXT];

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index f152007..04c06ed 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -26,6 +26,7 @@
 #include "pet/pet-util.h"
 #include "player/avatar.h"
 #include "player/race-info-table.h"
+#include "realm/realm-names-table.h"
 #include "store/store-util.h"
 #include "store/store.h"
 #include "system/angband-version.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 7e1cec6..bf66762 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -61,6 +61,7 @@
 #include "mind/racial.h" // do_cmd_racial_power() がある。ファイル名変更？.
 #include "mind/snipe-types.h"
 #include "mspell/mspells3.h" // do_cmd_cast_learned() がある。後で移設する.
+#include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
 #include "spell/spells-object.h"

diff --git a/src/market/building-service.c b/src/market/building-service.c
index 3482cf8..ea32c99 100644 (file)
--- a/src/market/building-service.c
+++ b/src/market/building-service.c
@@ -1,5 +1,6 @@
 #include "market/building-service.h"
 #include "cmd-building/cmd-building.h"
+#include "realm/realm-names-table.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 184f772..9dadf0d 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -43,6 +43,7 @@
 #include "player/player-personalities-types.h"
 #include "player/player-race-types.h"
 #include "player/player-status.h"
+#include "player/race-info-table.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 8903030..8eaeed6 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -62,6 +62,7 @@
 #include "player/player-skill.h"
 #include "player/race-info-table.h"
 #include "realm/realm-hex-numbers.h"
+#include "realm/realm-names-table.h"
 #include "realm/realm-song-numbers.h"
 #include "specific-object/bow.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index fb0639e..d77dfd7 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -85,6 +85,7 @@
 #include "player/player-personalities-types.h"
 #include "player/player-skill.h"
 #include "player/player-status.h"
+#include "realm/realm-names-table.h"
 #include "spell-kind/earthquake.h"
 #include "spell-kind/spells-floor.h"
 #include "spell-kind/spells-launcher.h"

diff --git a/src/store/store-owners.h b/src/store/store-owners.h
index b83db4e..c437af4 100644 (file)
--- a/src/store/store-owners.h
+++ b/src/store/store-owners.h
@@ -5,10 +5,7 @@
 #define MAX_STORES      10 /*!< 店舗の種類最大数 / Total number of stores (see "store.c", etc) */
 #define MAX_OWNERS      32 /*!< 各店舗毎の店主定義最大数 / Total number of owners per store (see "store.c", etc) */
 
-typedef struct owner_type owner_type;
-
-struct owner_type
-{
+typedef struct owner_type {
        concptr owner_name;     /* Name */
        PRICE max_cost;         /* Purse limit */
        byte max_inflate;       /* Inflation (max) */
@@ -16,6 +13,6 @@ struct owner_type
        byte haggle_per;        /* Haggle unit */
        byte insult_max;        /* Insult limit */
        byte owner_race;        /* Owner race */
-};
+} owner_type;
 
 extern const owner_type owners[MAX_STORES][MAX_OWNERS];

diff --git a/src/view/main-window-left-frame.c b/src/view/main-window-left-frame.c
index 2167fc7..1f9ee46 100644 (file)
--- a/src/view/main-window-left-frame.c
+++ b/src/view/main-window-left-frame.c
@@ -6,6 +6,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-status.h"
 #include "player/mimic-info-table.h"
+#include "player/player-class.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "util/string-processor.h"