[Refactor] #37353 ang_sort_comp_pet() to sort.c.

[hengband/hengband.git] / src / cmd-item.c

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 80bbf0d..2a9179d 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -64,7 +64,7 @@ void do_cmd_inven(void)
        /* Process "Escape" */
        if (command_new == ESCAPE)
        {
-               int wid, hgt;
+               TERM_LEN wid, hgt;
 
                Term_get_size(&wid, &hgt);
 
@@ -90,7 +90,6 @@ void do_cmd_equip(void)
 {
        char out_val[160];
 
-
        /* Note that we are in "equipment" mode */
        command_wrk = TRUE;
 
@@ -118,7 +117,7 @@ void do_cmd_equip(void)
        /* Process "Escape" */
        if (command_new == ESCAPE)
        {
-               int wid, hgt;
+               TERM_LEN wid, hgt;
 
                Term_get_size(&wid, &hgt);
 
@@ -298,16 +297,12 @@ void do_cmd_wield(void)
 
        if ((o_ptr->name1 == ART_STONEMASK) && object_is_known(o_ptr) && (p_ptr->prace != RACE_VAMPIRE) && (p_ptr->prace != RACE_ANDROID))
        {
-               char dummy[MAX_NLEN+80];
+               char dummy[MAX_NLEN+100];
 
                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
-#ifdef JP
-               sprintf(dummy, "%sを装備すると吸血鬼になります。よろしいですか？", o_name);
-#else
-               msg_format("%s will transforms you into a vampire permanently when equiped.", o_name);
-               sprintf(dummy, "Do you become a vampire?");
-#endif
+               sprintf(dummy, _("%sを装備すると吸血鬼になります。よろしいですか？",
+                       "%s will transforms you into a vampire permanently when equiped. Do you become a vampire?"), o_name);
 
                if (!get_check(dummy)) return;
        }
@@ -342,7 +337,7 @@ void do_cmd_wield(void)
                autopick_alter_item(item, FALSE);
        }
 
-       take_turn(p_ptr, 100);;
+       take_turn(p_ptr, 100);
        q_ptr = &forge;
 
        /* Obtain local object */
@@ -432,7 +427,7 @@ void do_cmd_wield(void)
                o_ptr->ident |= (IDENT_SENSE);
        }
 
-       /* The Stone Mask make the player turn into a vampire! */
+       /* The Stone Mask make the player current_world_ptr->game_turn into a vampire! */
        if ((o_ptr->name1 == ART_STONEMASK) && (p_ptr->prace != RACE_VAMPIRE) && (p_ptr->prace != RACE_ANDROID))
        {
                /* Turn into a vampire */
@@ -553,12 +548,12 @@ void do_cmd_takeoff(void)
                else
                {
                        msg_print(_("装備を外せなかった。", "You couldn't remove the equipment."));
-                       p_ptr->energy_use = 50;
+                       take_turn(p_ptr, 50);
                        return;
                }
        }
 
-       p_ptr->energy_use = 50;
+       take_turn(p_ptr, 50);
 
        /* Take off the item */
        (void)inven_takeoff(item, 255);
@@ -599,18 +594,13 @@ void do_cmd_drop(void)
                return;
        }
 
-
-       /* See how many items */
        if (o_ptr->number > 1)
        {
-               /* Get a quantity */
                amt = get_quantity(NULL, o_ptr->number);
-
-               /* Allow user abort */
                if (amt <= 0) return;
        }
 
-       p_ptr->energy_use = 50;
+       take_turn(p_ptr, 50);
 
        /* Drop (some of) the item */
        inven_drop(item, amt);
@@ -712,13 +702,9 @@ void do_cmd_destroy(void)
                } /* while (TRUE) */
        }
 
-       /* See how many items */
        if (o_ptr->number > 1)
        {
-               /* Get a quantity */
                amt = get_quantity(NULL, o_ptr->number);
-
-               /* Allow user abort */
                if (amt <= 0) return;
        }
 
@@ -728,12 +714,12 @@ void do_cmd_destroy(void)
        object_desc(o_name, o_ptr, 0);
        o_ptr->number = old_number;
 
-       take_turn(p_ptr, 100);;
+       take_turn(p_ptr, 100);
 
        /* Artifacts cannot be destroyed */
        if (!can_player_destroy_object(o_ptr))
        {
-               p_ptr->energy_use = 0;
+               free_turn(p_ptr);
 
                msg_format(_("%sは破壊不可能だ。", "You cannot destroy %s."), o_name);
                return;
@@ -883,10 +869,7 @@ void do_cmd_uninscribe(void)
 
        /* Remove the incription */
        o_ptr->inscription = 0;
-
-       /* Combine the pack */
        p_ptr->update |= (PU_COMBINE);
-
        p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
        /* .や$の関係で, 再計算が必要なはず -- henkma */
@@ -935,10 +918,7 @@ void do_cmd_inscribe(void)
        {
                /* Save the inscription */
                o_ptr->inscription = quark_add(out_val);
-
-               /* Combine the pack */
                p_ptr->update |= (PU_COMBINE);
-
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                /* .や$の関係で, 再計算が必要なはず -- henkma */
@@ -968,7 +948,7 @@ static void do_cmd_refill_lamp(void)
        o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
        if (!o_ptr) return;
 
-       p_ptr->energy_use = 50;
+       take_turn(p_ptr, 50);
 
        /* Access the lantern */
        j_ptr = &inventory[INVEN_LITE];
@@ -1009,28 +989,9 @@ static void do_cmd_refill_lamp(void)
                floor_item_optimize(0 - item);
        }
 
-       /* Recalculate torch */
        p_ptr->update |= (PU_TORCH);
 }
 
-
-/*!
- * @brief オブジェクトが松明に束ねられるかどうかを判定する
- * An "item_tester_hook" for refilling torches
- * @param o_ptr 判定したいオブジェクトの構造体参照ポインタ
- * @return オブジェクトが松明に束ねられるならばTRUEを返す
- */
-static bool item_tester_refill_torch(object_type *o_ptr)
-{
-       /* Torches are okay */
-       if ((o_ptr->tval == TV_LITE) &&
-           (o_ptr->sval == SV_LITE_TORCH)) return (TRUE);
-
-       /* Assume not okay */
-       return (FALSE);
-}
-
-
 /*!
  * @brief 松明を束ねるコマンドのメインルーチン
  * Refuel the players torch (from the pack or floor)
@@ -1046,7 +1007,7 @@ static void do_cmd_refill_torch(void)
        concptr q, s;
 
        /* Restrict the choices */
-       item_tester_hook = item_tester_refill_torch;
+       item_tester_hook = object_can_refill_torch;
 
        q = _("どの松明で明かりを強めますか? ", "Refuel with which torch? ");
        s = _("他に松明がない。", "You have no extra torches.");
@@ -1054,7 +1015,7 @@ static void do_cmd_refill_torch(void)
        o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
        if (!o_ptr) return;
 
-       p_ptr->energy_use = 50;
+       take_turn(p_ptr, 50);
 
        /* Access the primary torch */
        j_ptr = &inventory[INVEN_LITE];
@@ -1103,7 +1064,6 @@ static void do_cmd_refill_torch(void)
                floor_item_optimize(0 - item);
        }
 
-       /* Recalculate torch */
        p_ptr->update |= (PU_TORCH);
 }
 
@@ -1228,8 +1188,8 @@ void do_cmd_locate(void)
                }
 
                /* Prepare to ask which way to look */
-               sprintf(out_val, _("マップ位置 [%ld(%02ld),%ld(%02ld)] (プレイヤーの%s)  方向?", 
-                                              "Map sector [%ld(%02ld),%ld(%02ld)], which is%s your sector.  Direction?"),
+               sprintf(out_val, _("マップ位置 [%d(%02d),%d(%02d)] (プレイヤーの%s)  方向?", 
+                                              "Map sector [%d(%02d),%d(%02d)], which is%s your sector.  Direction?"),
                        y2 / (hgt / 2), y2 % (hgt / 2),
                        x2 / (wid / 2), x2 % (wid / 2), tmp_val);
 
@@ -1273,7 +1233,6 @@ void do_cmd_locate(void)
 }
 
 
-
 /*!
  * @brief モンスター種族情報を特定の基準によりソートするための比較処理
  * Sorting hook -- Comp function -- see below
@@ -1732,21 +1691,11 @@ void do_cmd_use(void)
                /* Read a scroll */
                case TV_SCROLL:
                {
-                       /* Check some conditions */
-                       if (p_ptr->blind)
-                       {
-                               msg_print(_("目が見えない。", "You can't see anything."));
-                               return;
-                       }
-                       if (no_lite())
-                       {
-                               msg_print(_("明かりがないので、暗くて読めない。", "You have no light to read by."));
-                               return;
-                       }
+                       if (cmd_limit_blind(p_ptr)) return;
                        if (cmd_limit_confused(p_ptr)) return;
 
-                 do_cmd_read_scroll_aux(item, TRUE);
-                 break;
+                       do_cmd_read_scroll_aux(item, TRUE);
+                       break;
                }
 
                /* Fire ammo */
@@ -1754,7 +1703,7 @@ void do_cmd_use(void)
                case TV_ARROW:
                case TV_BOLT:
                {
-                       exe_fire(item, &inventory[INVEN_BOW]);
+                       exe_fire(item, &inventory[INVEN_BOW], SP_NONE);
                        break;
                }