[Refactor] object_kind 構造体をクラス化するための準備として、まずはヘッダ依存性を減らした

diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp
index e767cb7..876f671 100644 (file)
--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -22,6 +22,7 @@
 #include "object-hook/hook-quest.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player-base/player-class.h"
 #include "player/player-status-table.h"

diff --git a/src/flavor/flavor-util.cpp b/src/flavor/flavor-util.cpp
index 7706677..b79bdd2 100644 (file)
--- a/src/flavor/flavor-util.cpp
+++ b/src/flavor/flavor-util.cpp
@@ -4,6 +4,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "sv-definition/sv-food-types.h"
 #include "system/artifact-type-definition.h"

diff --git a/src/flavor/tval-description-switcher.cpp b/src/flavor/tval-description-switcher.cpp
index 7d31813..414a04d 100644 (file)
--- a/src/flavor/tval-description-switcher.cpp
+++ b/src/flavor/tval-description-switcher.cpp
@@ -10,6 +10,7 @@
 #include "monster-race/monster-race.h"
 #include "object-enchant/trg-types.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "system/monster-race-definition.h"
 #include "system/object-type-definition.h"
 #include "util/enum-converter.h"

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index 984c8f7..f8696ad 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -28,6 +28,7 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player/special-defense-types.h"
 #include "sv-definition/sv-amulet-types.h"

diff --git a/src/inventory/recharge-processor.cpp b/src/inventory/recharge-processor.cpp
index 4558f91..1dd1317 100644 (file)
--- a/src/inventory/recharge-processor.cpp
+++ b/src/inventory/recharge-processor.cpp
@@ -6,6 +6,7 @@
 #include "hpmp/hp-mp-regenerator.h"
 #include "inventory/inventory-slot-types.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "system/floor-type-definition.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/load/old/item-loader-savefile50.cpp b/src/load/old/item-loader-savefile50.cpp
index ae1ee27..3bffd49 100644 (file)
--- a/src/load/old/item-loader-savefile50.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -10,6 +10,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-lite-types.h"
 #include "system/angband.h"
 #include "system/object-type-definition.h"

diff --git a/src/object-enchant/others/apply-magic-others.cpp b/src/object-enchant/others/apply-magic-others.cpp
index f036469..942a29d 100644 (file)
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -18,6 +18,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "sv-definition/sv-lite-types.h"
 #include "sv-definition/sv-other-types.h"

diff --git a/src/object-hook/hook-expendable.cpp b/src/object-hook/hook-expendable.cpp
index 433e6df..1d7d62f 100644 (file)
--- a/src/object-hook/hook-expendable.cpp
+++ b/src/object-hook/hook-expendable.cpp
@@ -6,6 +6,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "player-base/player-race.h"
 #include "player-info/mimic-info-table.h"

diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp
index da5f1a2..50bf5e1 100644 (file)
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -11,6 +11,7 @@
 #include "object-enchant/tr-types.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-potion-types.h"
 #include "system/object-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/object/object-kind.h b/src/object/object-kind.h
index d6d86c9..4ebb4ca 100644 (file)
--- a/src/object/object-kind.h
+++ b/src/object/object-kind.h
@@ -1,16 +1,13 @@
 #pragma once
 
-#include "system/angband.h"
-
 #include "object-enchant/tr-flags.h"
 #include "object-enchant/trg-types.h"
-#include "object/tval-types.h"
-#include "system/system-variables.h"
+#include "system/angband.h"
 #include "util/flag-group.h"
-
 #include <string>
 #include <vector>
 
+enum class ItemKindType : short;
 enum class RandomArtActType : short;
 struct object_kind {
     KIND_OBJECT_IDX idx{};

diff --git a/src/object/object-stack.cpp b/src/object/object-stack.cpp
index b32c327..92ad15f 100644 (file)
--- a/src/object/object-stack.cpp
+++ b/src/object/object-stack.cpp
@@ -11,6 +11,7 @@
 #include "object-enchant/trc-types.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "smith/object-smith.h"
 #include "sv-definition/sv-other-types.h"

diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp
index bd171bf..233ae6f 100644 (file)
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -8,6 +8,7 @@
 #include "object/object-flags.h"
 #include "object/object-kind.h"
 #include "object/object-value-calc.h"
+#include "object/tval-types.h"
 #include "perception/object-perception.h"
 #include "system/artifact-type-definition.h"
 #include "system/monster-race-definition.h"

diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index df6d3a1..7ef9795 100644 (file)
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -7,6 +7,7 @@
 #include "object/object-kind.h"
 #include "object/object-value-calc.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "player-base/player-race.h"
 #include "player-info/equipment-info.h"
 #include "player/player-status.h"

diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index b659ca2..391bfbe 100644 (file)
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -9,6 +9,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
+#include "object/tval-types.h"
 #include "system/object-type-definition.h"
 
 store_type *st_ptr = nullptr;

diff --git a/src/system/object-type-definition.cpp b/src/system/object-type-definition.cpp
index e30ab3b..71706d2 100644 (file)
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -16,6 +16,7 @@
 #include "object-enchant/trg-types.h"
 #include "object/object-flags.h"
 #include "object/object-kind.h"
+#include "object/tval-types.h"
 #include "smith/object-smith.h"
 #include "sv-definition/sv-armor-types.h"
 #include "sv-definition/sv-lite-types.h"
@@ -27,7 +28,6 @@
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/string-processor.h"
-
 #include <set>
 #include <unordered_map>