[Refactor] #37353 Separated hook-checker.c/h from object-hook.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index af90f02..ad15a27 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -217,6 +217,7 @@
     <ClCompile Include="..\..\src\mind\racial-kutar.c" />\r
     <ClCompile Include="..\..\src\mind\stances-table.c" />\r
     <ClCompile Include="..\..\src\object-hook\hook-bow.c" />\r
+    <ClCompile Include="..\..\src\object-hook\hook-checker.c" />\r
     <ClCompile Include="..\..\src\object-hook\hook-perception.c" />\r
     <ClCompile Include="..\..\src\object-hook\hook-weapon.c" />\r
     <ClCompile Include="..\..\src\object-hook\hook-armor.c" />\r
@@ -636,6 +637,7 @@
     <ClInclude Include="..\..\src\mspell\mspells3.h" />\r
     <ClInclude Include="..\..\src\object-hook\hook-armor.h" />\r
     <ClInclude Include="..\..\src\object-hook\hook-bow.h" />\r
+    <ClInclude Include="..\..\src\object-hook\hook-checker.h" />\r
     <ClInclude Include="..\..\src\object-hook\hook-perception.h" />\r
     <ClInclude Include="..\..\src\object-hook\hook-weapon.h" />\r
     <ClInclude Include="..\..\src\player\bad-status-setter.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index bb6c4bc..925aa2b 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1484,6 +1484,9 @@
     <ClCompile Include="..\..\src\object-hook\hook-armor.c">
       <Filter>object-hook</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object-hook\hook-checker.c">
+      <Filter>object-hook</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3259,6 +3262,9 @@
     <ClInclude Include="..\..\src\object-hook\hook-armor.h">
       <Filter>object-hook</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object-hook\hook-checker.h">
+      <Filter>object-hook</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 7fca158..c9207e1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -434,6 +434,7 @@ hengband_SOURCES = \
        \
        object-hook/hook-armor.c object-hook/hook-armor.h \
        object-hook/hook-bow.c object-hook/hook-bow.h \
+       object-hook/hook-checker.c object-hook/hook-checker.h \
        object-hook/hook-perception.c object-hook/hook-perception.h \
        object-hook/hook-weapon.c object-hook/hook-weapon.h \
        \

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
index 3b1f013..1486cd4 100644 (file)
--- a/src/autopick/autopick-matcher.c
+++ b/src/autopick/autopick-matcher.c
@@ -11,10 +11,11 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "perception/object-perception.h"
-#include "object/object-hook.h"
 #include "object-enchant/item-feeling.h"
 #include "object-hook/hook-armor.h"
 #include "object-hook/hook-bow.h"
+#include "object-hook/hook-checker.h"
+#include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-stack.h"
 #include "object/object-value.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 329138f..bffa29f 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -44,6 +44,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trc-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object-hook/hook-weapon.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 9040861..d2f4f55 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -56,6 +56,7 @@
 #include "monster/monster-info.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
+#include "object-hook/hook-checker.h"
 #include "object-hook/hook-weapon.h"
 #include "object/item-use-flags.h"
 #include "object/object-broken.h"

diff --git a/src/combat/aura-counterattack.c b/src/combat/aura-counterattack.c
index 810a715..b39e454 100644 (file)
--- a/src/combat/aura-counterattack.c
+++ b/src/combat/aura-counterattack.c
@@ -14,7 +14,7 @@
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"
 #include "object-hook/hook-armor.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
 #include "realm/realm-hex-numbers.h"
 #include "spell/process-effect.h"
 #include "spell-realm/spells-hex.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index b40cffd..09a5511 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -5,6 +5,7 @@
 #include "monster-floor/place-monster-types.h"
 #include "monster/monster-info.h"
 #include "object-enchant/tr-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-broken.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 2c47a0d..fb67a9a 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -16,6 +16,7 @@
 #include "monster/monster-status.h"
 #include "perception/object-perception.h"
 #include "object-enchant/object-ego.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index b61dec8..29124b7 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -17,6 +17,7 @@
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object-enchant/special-object-flags.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 040af28..51f5d39 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -49,6 +49,7 @@
 #include "monster/monster-update.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "pet/pet-util.h"
 #include "player/player-class.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index a113cfe..b108065 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -17,6 +17,7 @@
 #include "monster-floor/place-monster-types.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/special-object-flags.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/inventory/recharge-processor.c b/src/inventory/recharge-processor.c
index 47bce59..bd2dbee 100644 (file)
--- a/src/inventory/recharge-processor.c
+++ b/src/inventory/recharge-processor.c
@@ -1,7 +1,7 @@
 #include "inventory/recharge-processor.h"
 #include "core/hp-mp-regenerator.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flavor.h"
-#include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "player/player-move.h"
 #include "util/quarks.h"

diff --git a/src/io/load.c b/src/io/load.c
index b4da082..d551832 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -55,6 +55,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-enchant/trg-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 1c2d46f..34eadb2 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -38,7 +38,7 @@
 #include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/item-feeling.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"

diff --git a/src/object-enchant/apply-magic-accessory.c b/src/object-enchant/apply-magic-accessory.c
index b2bebb9..2c3d32d 100644 (file)
--- a/src/object-enchant/apply-magic-accessory.c
+++ b/src/object-enchant/apply-magic-accessory.c
@@ -12,7 +12,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-kind.h"
 #include "sv-definition/sv-amulet-types.h"
 #include "sv-definition/sv-ring-types.h"

diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c
index 204e45d..287f04e 100644 (file)
--- a/src/object-enchant/apply-magic.c
+++ b/src/object-enchant/apply-magic.c
@@ -22,6 +22,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-enchant/trg-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "sv-definition/sv-armor-types.h"

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index 9c9ae0f..6ac4e32 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -23,14 +23,16 @@
 #include "game-option/cheat-types.h"
 #include "grid/grid.h"
 #include "io/files-util.h"
-#include "perception/identification.h"
-#include "perception/object-perception.h"
 #include "object-enchant/object-boost.h"
 #include "object-enchant/object-curse.h"
 #include "object-enchant/object-ego.h"
 #include "object-enchant/random-art-bias-types.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
 #include "object-enchant/trg-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
@@ -38,16 +40,15 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value-calc.h"
-#include "object-enchant/special-object-flags.h"
-#include "sv-definition/sv-armor-types.h"
-#include "sv-definition/sv-weapon-types.h"
-#include "system/system-variables.h"
-#include "object-enchant/tr-types.h"
-#include "object-enchant/trc-types.h"
+#include "perception/identification.h"
+#include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-personalities-types.h"
 #include "spell/spells-object.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-weapon-types.h"
+#include "system/system-variables.h"
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"
 #include "view/display-messages.h"

diff --git a/src/object-enchant/object-curse.c b/src/object-enchant/object-curse.c
index 1b2f039..230cb49 100644 (file)
--- a/src/object-enchant/object-curse.c
+++ b/src/object-enchant/object-curse.c
@@ -3,6 +3,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/object-hook/hook-armor.c b/src/object-hook/hook-armor.c
index 5ee5161..395d946 100644 (file)
--- a/src/object-hook/hook-armor.c
+++ b/src/object-hook/hook-armor.c
@@ -1,5 +1,5 @@
 #include "object-hook/hook-armor.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-info.h"
 #include "sv-definition/sv-armor-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/object-hook/hook-checker.c b/src/object-hook/hook-checker.c
new file mode 100644 (file)
index 0000000..0982d58
--- /dev/null
+++ b/src/object-hook/hook-checker.c
@@ -0,0 +1,11 @@
+#include "object-hook/hook-checker.h"
+#include "system/object-type-definition.h"
+#include "object-enchant/special-object-flags.h"
+
+bool object_is_valid(object_type *o_ptr) { return o_ptr->k_idx != 0; }
+
+bool object_is_held_monster(object_type *o_ptr) { return o_ptr->held_m_idx != 0; }
+
+bool object_is_broken(object_type *o_ptr) { return (o_ptr->ident & IDENT_BROKEN) != 0; }
+
+bool object_is_cursed(object_type *o_ptr) { return o_ptr->curse_flags != 0; }

diff --git a/src/object-hook/hook-checker.h b/src/object-hook/hook-checker.h
new file mode 100644 (file)
index 0000000..dad8436
--- /dev/null
+++ b/src/object-hook/hook-checker.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "system/angband.h"
+
+bool object_is_valid(object_type *o_ptr);
+bool object_is_held_monster(object_type *o_ptr);
+bool object_is_broken(object_type *o_ptr);
+bool object_is_cursed(object_type *o_ptr);

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 9a60e1a..ede00ee 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -24,6 +24,7 @@
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trg-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-info.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index b7f7e5a..1c70dbd 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -19,6 +19,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trg-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-info.h"
 #include "object/object-kind.h"
@@ -813,10 +814,6 @@ bool item_tester_okay(player_type *player_ptr, object_type *o_ptr, tval_type tva
     return TRUE;
 }
 
-bool object_is_valid(object_type *o_ptr) { return o_ptr->k_idx != 0; }
-
-bool object_is_held_monster(object_type *o_ptr) { return o_ptr->held_m_idx != 0; }
-
 /*
  * Artifacts use the "name1" field
  */
@@ -826,13 +823,3 @@ bool object_is_fixed_artifact(object_type *o_ptr) { return o_ptr->name1 != 0; }
  * Ego-Items use the "name2" field
  */
 bool object_is_ego(object_type *o_ptr) { return o_ptr->name2 != 0; }
-
-/*
- * Broken items.
- */
-bool object_is_broken(object_type *o_ptr) { return (o_ptr->ident & IDENT_BROKEN) != 0; }
-
-/*
- * Cursed items.
- */
-bool object_is_cursed(object_type *o_ptr) { return o_ptr->curse_flags != 0; }

diff --git a/src/object/object-hook.h b/src/object/object-hook.h
index 4cc23dd..2917959 100644 (file)
--- a/src/object/object-hook.h
+++ b/src/object/object-hook.h
@@ -40,9 +40,5 @@ bool object_can_refill_torch(player_type *player_ptr, object_type *o_ptr);
 bool can_player_destroy_object(player_type *player_ptr, object_type *o_ptr);
 bool object_is_quest_target(player_type *player_ptr, object_type *o_ptr);
 bool item_tester_okay(player_type *player_ptr, object_type *o_ptr, tval_type tval);
-bool object_is_valid(object_type *o_ptr);
-bool object_is_held_monster(object_type *o_ptr);
 bool object_is_fixed_artifact(object_type *o_ptr);
 bool object_is_ego(object_type *o_ptr);
-bool object_is_broken(object_type *o_ptr);
-bool object_is_cursed(object_type *o_ptr);

diff --git a/src/object/object-value-calc.c b/src/object/object-value-calc.c
index 73d02be..afee34e 100644 (file)
--- a/src/object/object-value-calc.c
+++ b/src/object/object-value-calc.c
@@ -3,6 +3,7 @@
 #include "object-enchant/object-ego.h"
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/object/object-value.c b/src/object/object-value.c
index fc57eee..8de7925 100644 (file)
--- a/src/object/object-value.c
+++ b/src/object/object-value.c
@@ -1,16 +1,17 @@
 #include "object/object-value.h"
+#include "monster-race/monster-race.h"
 #include "object-enchant/artifact.h"
-#include "object-enchant/tr-types.h"
-#include "perception/object-perception.h"
-#include "object/object-broken.h"
 #include "object-enchant/object-curse.h"
 #include "object-enchant/object-ego.h"
+#include "object-enchant/special-object-flags.h"
+#include "object-enchant/tr-types.h"
+#include "object-hook/hook-checker.h"
+#include "object/object-broken.h"
 #include "object/object-flags.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value-calc.h"
-#include "object-enchant/special-object-flags.h"
-#include "monster-race/monster-race.h"
+#include "perception/object-perception.h"
 #include "util/bit-flags-calculator.h"
 
 /*!

diff --git a/src/perception/identification.c b/src/perception/identification.c
index 0b39076..3bfae0f 100644 (file)
--- a/src/perception/identification.c
+++ b/src/perception/identification.c
@@ -11,6 +11,7 @@
 #include "object-enchant/trc-types.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-info.h"

diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c
index b9aea6c..06c86a1 100644 (file)
--- a/src/perception/simple-perception.c
+++ b/src/perception/simple-perception.c
@@ -10,6 +10,7 @@
 #include "game-option/disturbance-options.h"
 #include "inventory/player-inventory.h"
 #include "object-enchant/special-object-flags.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-info.h"

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 57fe558..4ce9ba5 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -41,6 +41,7 @@
 #include "object-enchant/object-ego.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trg-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 201f4e0..a0d8407 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -43,6 +43,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 34c7570..a94b0f3 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -29,6 +29,7 @@
 #include "object-enchant/tr-types.h"
 #include "object-enchant/trc-types.h"
 #include "object-hook/hook-armor.h"
+#include "object-hook/hook-checker.h"
 #include "object/item-use-flags.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"
@@ -37,15 +38,15 @@
 #include "player/player-skill.h"
 #include "player/player-status.h"
 #include "realm/realm-hex-numbers.h"
-#include "spell/process-effect.h"
-#include "spell/spells-execution.h"
-#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"
-#include "spell/spells-status.h"
 #include "spell-kind/spells-teleport.h"
+#include "spell-realm/spells-hex.h"
+#include "spell/process-effect.h"
 #include "spell/spell-types.h"
+#include "spell/spells-execution.h"
+#include "spell/spells-status.h"
 #include "spell/spells3.h"
 #include "spell/technic-info-table.h"
 #include "term/screen-processor.h"

diff --git a/src/spell-kind/spells-curse-removal.c b/src/spell-kind/spells-curse-removal.c
index efcffae..bfd3581 100644 (file)
--- a/src/spell-kind/spells-curse-removal.c
+++ b/src/spell-kind/spells-curse-removal.c
@@ -2,7 +2,7 @@
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/trc-types.h"
-#include "object/object-hook.h"
+#include "object-hook/hook-checker.h"
 #include "system/object-type-definition.h"
 #include "view/display-messages.h"
 

diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c
index 41c62cb..0cbba4e 100644 (file)
--- a/src/spell-kind/spells-detection.c
+++ b/src/spell-kind/spells-detection.c
@@ -12,6 +12,7 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-song-numbers.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index b3fbf05..e6cc7dd 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -30,6 +30,7 @@
 #include "monster/smart-learn-types.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/special-object-flags.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index 23777f8..bc428d2 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -34,8 +34,8 @@
 #include "monster/monster-update.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"
+#include "object-hook/hook-checker.h"
 #include "object/object-flags.h"
-#include "object/object-hook.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
 #include "spell-kind/spells-launcher.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index c64f875..ac97c9b 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -31,6 +31,7 @@
 #include "object-enchant/trg-types.h"
 #include "object-hook/hook-armor.h"
 #include "object-hook/hook-bow.h"
+#include "object-hook/hook-checker.h"
 #include "object/item-use-flags.h"
 #include "object/object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/store/store.c b/src/store/store.c
index e47ecb2..a5d1159 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -57,6 +57,7 @@
 #include "mind/mind.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"
+#include "object-hook/hook-checker.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"