[Refactor] #37353 'kubi'/'shoukinkubi'を'bounty'に変更 / Changed 'kubi' and 'shoukinkubi...

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

diff --git a/src/object-hook.c b/src/object-hook.c
index 245ec95..4d8c5e9 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -197,7 +197,7 @@ bool item_tester_hook_wear(object_type *o_ptr)
                if (p_ptr->psex == SEX_MALE) return FALSE;
 
        /* Check for a usable slot */
-       if (wield_slot(o_ptr) >= INVEN_RARM) return (TRUE);
+       if (wield_slot(p_ptr, o_ptr) >= INVEN_RARM) return (TRUE);
 
        return (FALSE);
 }
@@ -524,7 +524,7 @@ bool object_is_potion(object_type *o_ptr)
  * @param o_ptr 対象のオブジェクト構造体ポインタ
  * @return オブジェクトが報酬対象になるならTRUEを返す
  */
-bool object_is_shoukinkubi(object_type *o_ptr)
+bool object_is_bounty(object_type *o_ptr)
 {
        int i;
 
@@ -541,9 +541,9 @@ bool object_is_shoukinkubi(object_type *o_ptr)
        if (o_ptr->pval == MON_TSUCHINOKO) return TRUE;
 
        /* Unique monster */
-       for (i = 0; i < MAX_KUBI; i++)
+       for (i = 0; i < MAX_BOUNTY; i++)
                if (o_ptr->pval == current_world_ptr->bounty_r_idx[i]) break;
-       if (i < MAX_KUBI) return TRUE;
+       if (i < MAX_BOUNTY) return TRUE;
 
        /* Not wanted */
        return FALSE;
@@ -949,9 +949,9 @@ bool can_player_destroy_object(object_type *o_ptr)
  */
 bool object_is_quest_target(object_type *o_ptr)
 {
-       if (p_ptr->inside_quest)
+       if (p_ptr->current_floor_ptr->inside_quest)
        {
-               ARTIFACT_IDX a_idx = quest[p_ptr->inside_quest].k_idx;
+               ARTIFACT_IDX a_idx = quest[p_ptr->current_floor_ptr->inside_quest].k_idx;
                if (a_idx)
                {
                        artifact_type *a_ptr = &a_info[a_idx];