[Refactor] #40399 Moved lookup_kind() from object2.c/h to object-kind-hook.c/h

diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c
index dff655b..30bb60a 100644 (file)
--- a/src/birth/game-play-initializer.c
+++ b/src/birth/game-play-initializer.c
@@ -2,11 +2,11 @@
 #include "dungeon/dungeon-file.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/floor.h"
 #include "market/arena.h"
 #include "object/artifact.h"
 #include "object/object-generator.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 #include "pet/pet-util.h"
 #include "player/player-races-table.h"
 #include "system/system-variables.h"

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index 1336176..884edfc 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -8,6 +8,7 @@
 #include "object/object-appraiser.h"
 #include "object/object-ego.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object1.h"
 #include "object/object2.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 74ba189..1341b50 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -15,8 +15,8 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 #include "object/special-object-flags.h"
 #include "object/sv-food-types.h"
 #include "object/sv-other-types.h"

diff --git a/src/cmd-item/cmd-magiceat.c b/src/cmd-item/cmd-magiceat.c
index f042b81..1ed9c8b 100644 (file)
--- a/src/cmd-item/cmd-magiceat.c
+++ b/src/cmd-item/cmd-magiceat.c
@@ -58,8 +58,8 @@
 #include "cmd/cmd-basic.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 #include "object/sv-other-types.h"
 #include "object/sv-rod-types.h"
 #include "player/avatar.h"

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index c2b1f8a..fa0361c 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -6,10 +6,10 @@
  */
 
 #include "combat/attack-chaos-effect.h"
+#include "floor/floor.h"
 #include "monster/monster-status.h"
 #include "inventory/inventory-object.h"
 #include "object/artifact.h"
-#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-hex.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index a33a5c7..f70198f 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -54,6 +54,7 @@
 #include "object/item-apply-magic.h"
 #include "object/object-ego.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "object/sv-scroll-types.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index d5771be..ca8cd8f 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -14,12 +14,12 @@
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"
 #include "floor/floor-object.h"
+#include "object/object-kind-hook.h"
 #include "monster/monster-status.h"
 #include "player/avatar.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"
 #include "spell/spells3.h"
-#include "object/object2.h"
 #include "object/object-generator.h"
 #include "object/special-object-flags.h"
 #include "object/sv-other-types.h"

diff --git a/src/io-dump/special-class-dump.c b/src/io-dump/special-class-dump.c
index 1ed22e1..ea332c1 100644 (file)
--- a/src/io-dump/special-class-dump.c
+++ b/src/io-dump/special-class-dump.c
@@ -8,8 +8,8 @@
 #include "cmd-item/cmd-magiceat.h"
 #include "cmd-item/cmd-smith.h"
 #include "mspell/monster-spell.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 
 typedef struct {
        BIT_FLAGS f4;

diff --git a/src/io/load.c b/src/io/load.c
index 7c0da6d..25abe5b 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -67,6 +67,7 @@
 #include "object/object-ego.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object2.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 57422b4..236171b 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -8,6 +8,7 @@
 #include "core/show-file.h"
 #include "core/sort.h"
 #include "core/stuff-handler.h"
+#include "floor/floor.h"
 #include "io-dump/dump-util.h"
 #include "knowledge/object-group-table.h"
 #include "object/artifact.h"
@@ -15,8 +16,8 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 #include "object/special-object-flags.h"
 #include "term/gameterm.h"
 #include "view/display-main-window.h" // 暫定、後で消す.

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 6dff757..81d8ab6 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -8,11 +8,12 @@
 #include "knowledge-quests.h"
 #include "io-dump/dump-util.h"
 #include "dungeon/quest.h"
+#include "floor/floor.h"
 #include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
 #include "object/artifact.h"
-#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/special-object-flags.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/dungeon-file.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index c95b9d0..ae3100b 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"
+#include "floor/floor.h"
 #include "inventory/inventory-object.h"
 #include "market/bounty-prize-table.h"
 #include "market/building-util.h"
@@ -9,6 +10,7 @@
 #include "object/item-apply-magic.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
+#include "object/object-kind-hook.h"
 #include "object/object-generator.h"
 #include "object/object2.h"
 #include "object/sv-other-types.h"

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 9f5ab16..78c4cba 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -8,9 +8,9 @@
 #include "object/object-boost.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object/object2.h"
 #include "object/special-object-flags.h"
 #include "object/sv-other-types.h"
 #include "object/sv-weapon-types.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index c402532..8b91e87 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -25,6 +25,7 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object1.h"
 #include "object/object2.h"

diff --git a/src/object/object-kind-hook.c b/src/object/object-kind-hook.c
index 46ac6e5..808ec69 100644 (file)
--- a/src/object/object-kind-hook.c
+++ b/src/object/object-kind-hook.c
@@ -7,6 +7,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/sv-amulet-types.h"
+#include "object/sv-other-types.h"
 #include "object/sv-ring-types.h"
 
 /*
@@ -253,3 +254,36 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx)
        /* Assume not good */
        return FALSE;
 }
+
+/*!
+ * @brief tvalとsvalに対応するベースアイテムのIDを返す。
+ * Find the index of the object_kind with the given tval and sval
+ * @param tval 検索したいベースアイテムのtval
+ * @param sval 検索したいベースアイテムのsval
+ * @return なし
+ */
+KIND_OBJECT_IDX lookup_kind(tval_type tval, OBJECT_SUBTYPE_VALUE sval)
+{
+    int num = 0;
+    KIND_OBJECT_IDX bk = 0;
+
+    for (KIND_OBJECT_IDX k = 1; k < max_k_idx; k++) {
+        object_kind *k_ptr = &k_info[k];
+        if (k_ptr->tval != tval)
+            continue;
+        if (k_ptr->sval == sval)
+            return (k);
+        if (sval != SV_ANY)
+            continue;
+        if (!one_in_(++num))
+            continue;
+
+        bk = k;
+    }
+
+    if (sval == SV_ANY) {
+        return bk;
+    }
+
+    return 0;
+}

diff --git a/src/object/object-kind-hook.h b/src/object/object-kind-hook.h
index 49061bf..275a74e 100644 (file)
--- a/src/object/object-kind-hook.h
+++ b/src/object/object-kind-hook.h
@@ -11,3 +11,5 @@ bool kind_is_armor(KIND_OBJECT_IDX k_idx);
 bool kind_is_hafted(KIND_OBJECT_IDX k_idx);
 bool kind_is_potion(KIND_OBJECT_IDX k_idx);
 bool kind_is_good(KIND_OBJECT_IDX k_idx);
+
+IDX lookup_kind(tval_type tval, OBJECT_SUBTYPE_VALUE sval);

diff --git a/src/object/object2.c b/src/object/object2.c
index 91967b1..4aff4f3 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -30,6 +30,7 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h" // 暫定、相互参照している.
@@ -678,38 +679,6 @@ void object_absorb(object_type *o_ptr, object_type *j_ptr)
 
 
 /*!
- * @brief tvalとsvalに対応するベースアイテムのIDを返す。
- * Find the index of the object_kind with the given tval and sval
- * @param tval 検索したいベースアイテムのtval
- * @param sval 検索したいベースアイテムのsval
- * @return なし
- */
-KIND_OBJECT_IDX lookup_kind(tval_type tval, OBJECT_SUBTYPE_VALUE sval)
-{
-       int num = 0;
-       KIND_OBJECT_IDX bk = 0;
-
-       for (KIND_OBJECT_IDX k = 1; k < max_k_idx; k++)
-       {
-               object_kind *k_ptr = &k_info[k];
-               if (k_ptr->tval != tval) continue;
-               if (k_ptr->sval == sval) return (k);
-               if (sval != SV_ANY) continue;
-               if (!one_in_(++num)) continue;
-
-               bk = k;
-       }
-
-       if (sval == SV_ANY)
-       {
-               return bk;
-       }
-
-       return 0;
-}
-
-
-/*!
  * @brief アイテムのエゴをレア度の重みに合わせてランダムに選択する
  * Choose random ego type
  * @param slot 取得したいエゴの装備部位

diff --git a/src/object/object2.h b/src/object/object2.h
index 56df06e..6d6c033 100644 (file)
--- a/src/object/object2.h
+++ b/src/object/object2.h
@@ -15,7 +15,6 @@ void reduce_charges(object_type *o_ptr, int amt);
 int object_similar_part(object_type *o_ptr, object_type *j_ptr);
 bool object_similar(object_type *o_ptr, object_type *j_ptr);
 void object_absorb(object_type *o_ptr, object_type *j_ptr);
-IDX lookup_kind(tval_type tval, OBJECT_SUBTYPE_VALUE sval);
 void apply_magic(player_type *owner_type, object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
 bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
 void floor_item_describe(player_type *player_ptr, INVENTORY_IDX item); // 暫定、元々object2.c の内部からのみ呼ばれていた.

diff --git a/src/player/process-death.c b/src/player/process-death.c
index 36e33ad..0773679 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -9,11 +9,11 @@
 #include "process-death.h"
 #include "core/stuff-handler.h"
 #include "floor/floor-town.h"
+#include "floor/floor.h"
 #include "inventory/player-inventory.h"
 #include "object/item-use-flags.h"
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
-#include "object/object2.h"
 #include "store/store-util.h"
 #include "store/store.h"
 #include "term/gameterm.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index a4ec974..41c8117 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -5,7 +5,7 @@
 #include "floor/floor-object.h"
 #include "io/targeting.h"
 #include "object/object-generator.h"
-#include "object/object2.h"
+#include "object/object-kind-hook.h"
 #include "object/sv-food-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 71702d3..8754cb4 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -23,6 +23,7 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 1b395ba..5e6be5b 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -16,8 +16,8 @@
 #include "monster/monster.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index f3ac04d..53bb4c1 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -40,6 +40,7 @@
 #include "object/object-appraiser.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"

diff --git a/src/store/rumor.c b/src/store/rumor.c
index c8944a6..c42f0a6 100644 (file)
--- a/src/store/rumor.c
+++ b/src/store/rumor.c
@@ -8,7 +8,7 @@
 #include "object/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
-#include "object/object2.h"
+#include "object/object-kind-hook.h"
 #include "object/special-object-flags.h"
 #include "util/util.h"
 #include "world/world.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 7652e60..545c3e8 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -21,6 +21,7 @@
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
+#include "floor/floor.h"
 #include "floor/floor-town.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
@@ -34,7 +35,6 @@
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/object2.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 162cc54..7e98ada 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -20,9 +20,9 @@
 #include "object/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-value.h"
-#include "object/object2.h"
 #include "object/special-object-flags.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"