[Refactor] #39076 冗長なコメントを削除 (/* Recall */)

[hengband/hengband.git] / src / bldg.c

diff --git a/src/bldg.c b/src/bldg.c
index f5aeb36..de98925 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -18,6 +18,7 @@
 
 #include "core.h"
 #include "cmd-dump.h"
+#include "cmd-magiceat.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"
@@ -41,14 +42,16 @@
 #include "artifact.h"
 #include "cmd-spell.h"
 #include "rumor.h"
-#include "player-status.h"
 #include "spells.h"
 #include "spells-status.h"
 #include "realm-hex.h"
 #include "dungeon-file.h"
 
 #include "files.h"
+#include "player-status.h"
 #include "player-effects.h"
+#include "player-class.h"
+#include "player-personality.h"
 #include "scores.h"
 #include "shoot.h"
 #include "view-mainwindow.h"
@@ -68,6 +71,7 @@ PRICE kakekin;
 int sel_monster;
 
 bool reinit_wilderness = FALSE;
+MONSTER_IDX today_mon;
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル
@@ -2656,7 +2660,7 @@ static PRICE compare_weapons(PRICE bcost)
        q = _("第一の武器は？", "What is your first weapon? ");
        s = _("比べるものがありません。", "You have nothing to compare.");
 
-       o_ptr[0] = choose_object(&item, q, s, (USE_EQUIP | USE_INVEN | IGNORE_BOTHHAND_SLOT));
+       o_ptr[0] = choose_object(&item, q, s, (USE_EQUIP | USE_INVEN | IGNORE_BOTHHAND_SLOT), 0);
        if (!o_ptr[0])
        {
                screen_load();
@@ -2727,7 +2731,7 @@ static PRICE compare_weapons(PRICE bcost)
                        s = _("比べるものがありません。", "You have nothing to compare.");
 
                        /* Get the second weapon */
-                       o_ptr[1] = choose_object(&item2, q, s, (USE_EQUIP | USE_INVEN | IGNORE_BOTHHAND_SLOT));
+                       o_ptr[1] = choose_object(&item2, q, s, (USE_EQUIP | USE_INVEN | IGNORE_BOTHHAND_SLOT), 0);
                        if (!o_ptr[1]) continue;
 
                        total += cost;
@@ -2917,7 +2921,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        /* Only forge broken weapons */
        item_tester_hook = item_tester_hook_broken_weapon;
 
-       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_EQUIP));
+       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_EQUIP), 0);
        if (!o_ptr) return (0);
 
        /* It is worthless */
@@ -2944,7 +2948,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        /* Only forge broken weapons */
        item_tester_hook = item_tester_hook_orthodox_melee_weapons;
 
-       mo_ptr = choose_object(&mater, q, s, (USE_INVEN | USE_EQUIP));
+       mo_ptr = choose_object(&mater, q, s, (USE_INVEN | USE_EQUIP), 0);
        if (!mo_ptr) return (0);
        if (mater == item)
        {
@@ -3180,7 +3184,7 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C
        q = _("どのアイテムを改良しますか？", "Improve which item? ");
        s = _("改良できるものがありません。", "You have nothing to improve.");
 
-       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_EQUIP | IGNORE_BOTHHAND_SLOT));
+       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_EQUIP | IGNORE_BOTHHAND_SLOT), item_tester_tval);
        if (!o_ptr) return (FALSE);
 
        /* Check if the player has enough money */
@@ -3293,7 +3297,7 @@ static void building_recharge(void)
        q = _("どのアイテムに魔力を充填しますか? ", "Recharge which item? ");
        s = _("魔力を充填すべきアイテムがない。", "You have nothing to recharge.");
 
-       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
+       o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), 0);
        if (!o_ptr) return;
 
        k_ptr = &k_info[o_ptr->k_idx];
@@ -3789,7 +3793,6 @@ static bool research_mon(void)
                /* Interact */
                while (1)
                {
-                       /* Recall */
                        if (recall)
                        {
                                /*** Recall on screen ***/