[Refactor] #37353 コメント整理。 / Refactor comments.

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

diff --git a/src/cmd-item.c b/src/cmd-item.c
index ae3e71f..dcc19ec 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -342,7 +342,7 @@ void do_cmd_wield(void)
                autopick_alter_item(item, FALSE);
        }
 
-       p_ptr->energy_use = 100;
+       take_turn(p_ptr, 100);;
        q_ptr = &forge;
 
        /* Obtain local object */
@@ -728,12 +728,12 @@ void do_cmd_destroy(void)
        object_desc(o_name, o_ptr, 0);
        o_ptr->number = old_number;
 
-       p_ptr->energy_use = 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 +883,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 +932,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 */
@@ -1228,8 +1222,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);
 
@@ -1367,7 +1361,6 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b)
 void ang_sort_swap_hook(vptr u, vptr v, int a, int b)
 {
        u16b *who = (u16b*)(u);
-
        u16b holder;
 
        /* Unused */
@@ -1402,19 +1395,19 @@ void do_cmd_query_symbol(void)
        IDX i;
        int n;
        MONRACE_IDX r_idx;
-       char    sym, query;
-       char    buf[128];
+       char sym, query;
+       char buf[128];
 
-       bool    all = FALSE;
-       bool    uniq = FALSE;
-       bool    norm = FALSE;
-       bool    ride = FALSE;
-       char    temp[80] = "";
+       bool all = FALSE;
+       bool uniq = FALSE;
+       bool norm = FALSE;
+       bool ride = FALSE;
+       char temp[80] = "";
 
-       bool    recall = FALSE;
+       bool recall = FALSE;
 
-       u16b    why = 0;
-       IDX     *who;
+       u16b why = 0;
+       MONRACE_IDX *who;
 
        /* Get a character, or abort */
        if (!get_com(_("知りたい文字を入力して下さい(記号 or ^A全,^Uユ,^N非ユ,^R乗馬,^M名前): ", 
@@ -1671,12 +1664,7 @@ void do_cmd_use(void)
                return;
        }
 
-       if (p_ptr->inside_arena)
-       {
-               msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
-               msg_print(NULL);
-               return;
-       }
+       if (cmd_limit_arena(p_ptr)) return;
 
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
@@ -1738,25 +1726,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 (p_ptr->confused)
-                       {
-                               msg_print(_("混乱していて読めない！", "You are too confused!"));
-                               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 */