[Refactor] #2797 object-kind-hook.h からtval-types.h への参照を外した

diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
index c3b08cb..0525c2f 100644 (file)
--- a/src/artifact/random-art-generator.cpp
+++ b/src/artifact/random-art-generator.cpp
@@ -27,6 +27,7 @@
 #include "object/object-flags.h"
 #include "object/object-kind-hook.h"
 #include "object/object-value-calc.h"
+#include "object/tval-types.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index 8bc9653..e289875 100644 (file)
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -17,6 +17,7 @@
 #include "knowledge/object-group-table.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-kind-hook.h"
+#include "object/tval-types.h"
 #include "perception/identification.h"
 #include "perception/object-perception.h"
 #include "system/artifact-type-definition.h"

diff --git a/src/object-enchant/protector/apply-magic-armor.cpp b/src/object-enchant/protector/apply-magic-armor.cpp
index 91bcbf8..17a5d49 100644 (file)
--- a/src/object-enchant/protector/apply-magic-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-armor.cpp
@@ -9,6 +9,7 @@
 #include "artifact/random-art-generator.h"
 #include "inventory/inventory-slot-types.h"
 #include "object/object-kind-hook.h"
+#include "object/tval-types.h"
 #include "system/object-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/object-enchant/protector/apply-magic-soft-armor.cpp b/src/object-enchant/protector/apply-magic-soft-armor.cpp
index 2484693..3152eb1 100644 (file)
--- a/src/object-enchant/protector/apply-magic-soft-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-soft-armor.cpp
@@ -6,6 +6,7 @@
 
 #include "object-enchant/protector/apply-magic-soft-armor.h"
 #include "object/object-kind-hook.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-armor-types.h"
 #include "system/baseitem-info-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/object/object-kind-hook.cpp b/src/object/object-kind-hook.cpp
index 38a0d45..af0f9a1 100644 (file)
--- a/src/object/object-kind-hook.cpp
+++ b/src/object/object-kind-hook.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "object/object-kind-hook.h"
+#include "object/tval-types.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-other-types.h"
 #include "sv-definition/sv-ring-types.h"

diff --git a/src/object/object-kind-hook.h b/src/object/object-kind-hook.h
index b01d22e..0c15a99 100644 (file)
--- a/src/object/object-kind-hook.h
+++ b/src/object/object-kind-hook.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "object/tval-types.h"
-
 bool kind_is_cloak(short bi_id);
 bool kind_is_polearm(short bi_id);
 bool kind_is_sword(short bi_id);