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

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

diff --git a/src/bldg.c b/src/bldg.c
index cd5eb3b..de98925 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -14,9 +14,11 @@
 
 #include "angband.h"
 #include "util.h"
+#include "term.h"
 
 #include "core.h"
 #include "cmd-dump.h"
+#include "cmd-magiceat.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"
@@ -40,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"
@@ -60,6 +64,14 @@
  */
 building_type building[MAX_BLDG];
 
+MONRACE_IDX battle_mon[4];
+u32b mon_odds[4];
+int battle_odds;
+PRICE kakekin;
+int sel_monster;
+
+bool reinit_wilderness = FALSE;
+MONSTER_IDX today_mon;
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル
@@ -1543,10 +1555,10 @@ static bool kakutoujou(void)
        char out_val[160], tmp_str[80];
        concptr p;
 
-       if ((current_world_ptr->game_turn - old_battle) > TURNS_PER_TICK * 250)
+       if ((current_world_ptr->game_turn - current_world_ptr->arena_start_turn) > TURNS_PER_TICK * 250)
        {
                update_gambling_monsters();
-               old_battle = current_world_ptr->game_turn;
+               current_world_ptr->arena_start_turn = current_world_ptr->game_turn;
        }
 
        screen_save();
@@ -2630,7 +2642,7 @@ static PRICE compare_weapons(PRICE bcost)
        concptr q, s;
        TERM_LEN row = 2;
        TERM_LEN wid = 38, mgn = 2;
-       bool old_character_xtra = character_xtra;
+       bool old_character_xtra = current_world_ptr->character_xtra;
        char ch;
        PRICE total = 0;
        PRICE cost = 0; /* First time no price */
@@ -2648,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();
@@ -2666,7 +2678,7 @@ static PRICE compare_weapons(PRICE bcost)
                item_tester_hook = item_tester_hook_orthodox_melee_weapons;
 
                /* Hack -- prevent "icky" message */
-               character_xtra = TRUE;
+               current_world_ptr->character_xtra = TRUE;
 
                /* Diaplay selected weapon's infomation */
                for (i = 0; i < n; i++)
@@ -2691,7 +2703,7 @@ static PRICE compare_weapons(PRICE bcost)
                p_ptr->update |= PU_BONUS;
                handle_stuff();
 
-               character_xtra = old_character_xtra;
+               current_world_ptr->character_xtra = old_character_xtra;
 
 #ifdef JP
                put_str(format("[ 比較対象: 's'で変更 ($%d) ]", cost), 1, (wid + mgn));
@@ -2719,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;
@@ -2909,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 */
@@ -2936,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)
        {
@@ -3172,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 */
@@ -3285,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];
@@ -3781,7 +3793,6 @@ static bool research_mon(void)
                /* Interact */
                while (1)
                {
-                       /* Recall */
                        if (recall)
                        {
                                /*** Recall on screen ***/
@@ -3802,7 +3813,6 @@ static bool research_mon(void)
                                old_i = i;
                        }
 
-                       /* Command */
                        query = inkey();
 
                        /* Normal commands */
@@ -4142,7 +4152,7 @@ void do_cmd_bldg(void)
        forget_view();
 
        /* Hack -- Increase "icky" depth */
-       character_icky++;
+       current_world_ptr->character_icky++;
 
        command_arg = 0;
        command_rep = 0;
@@ -4199,7 +4209,7 @@ void do_cmd_bldg(void)
        }
 
        /* Hack -- Decrease "icky" depth */
-       character_icky--;
+       current_world_ptr->character_icky--;
 
        Term_clear();