[Refactor] #37353 quest_type 構造体を quest.h へ移動。

[hengband/hengband.git] / src / object-hook.c

diff --git a/src/object-hook.c b/src/object-hook.c
index bc903db..bef3585 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -1,7 +1,12 @@
 
 #include "angband.h"
+#include "util.h"
+
 #include "object-hook.h"
+#include "monster.h"
 #include "artifact.h"
+#include "player-skill.h"
+#include "quest.h"
 
 /*!
 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
@@ -12,9 +17,7 @@
 bool item_tester_hook_convertible(object_type *o_ptr)
 {
        if ((o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_SKELETON)) return TRUE;
-
        if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_SKELETON)) return TRUE;
-       /* Assume not */
        return (FALSE);
 }
 
@@ -51,8 +54,6 @@ bool item_tester_hook_melee_weapon(object_type *o_ptr)
 {
        /* Check for a usable slot */
        if ((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) return (TRUE);
-
-       /* Assume not wearable */
        return (FALSE);
 }
 
@@ -104,8 +105,6 @@ bool item_tester_hook_broken_weapon(object_type *o_ptr)
 bool item_tester_hook_boomerang(object_type *o_ptr)
 {
        if ((o_ptr->tval == TV_DIGGING) || (o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM) || (o_ptr->tval == TV_HAFTED)) return (TRUE);
-
-       /* Assume not */
        return (FALSE);
 }
 
@@ -145,7 +144,6 @@ bool item_tester_hook_eatable(object_type *o_ptr)
                        return TRUE;
        }
 
-       /* Assume not */
        return (FALSE);
 }
 
@@ -160,8 +158,6 @@ bool item_tester_hook_mochikae(object_type *o_ptr)
        if (((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) ||
                (o_ptr->tval == TV_SHIELD) || (o_ptr->tval == TV_CAPTURE) ||
                (o_ptr->tval == TV_CARD)) return (TRUE);
-
-       /* Assume not wearable */
        return (FALSE);
 }
 
@@ -182,7 +178,6 @@ bool item_tester_hook_activate(object_type *o_ptr)
        /* Check activation flag */
        if (have_flag(flgs, TR_ACTIVATE)) return (TRUE);
 
-       /* Assume not */
        return (FALSE);
 }
 
@@ -199,7 +194,6 @@ bool item_tester_hook_wear(object_type *o_ptr)
        /* Check for a usable slot */
        if (wield_slot(o_ptr) >= INVEN_RARM) return (TRUE);
 
-       /* Assume not wearable */
        return (FALSE);
 }
 
@@ -253,7 +247,6 @@ bool item_tester_hook_use(object_type *o_ptr)
        }
        }
 
-       /* Assume not */
        return (FALSE);
 }
 
@@ -286,8 +279,6 @@ bool item_tester_hook_quaff(object_type *o_ptr)
 bool item_tester_hook_readable(object_type *o_ptr)
 {
        if ((o_ptr->tval == TV_SCROLL) || (o_ptr->tval == TV_PARCHMENT) || (o_ptr->name1 == ART_GHB) || (o_ptr->name1 == ART_POWER)) return (TRUE);
-
-       /* Assume not */
        return (FALSE);
 }
 
@@ -971,3 +962,4 @@ bool object_is_quest_target(object_type *o_ptr)
        return FALSE;
 }
 
+