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

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

diff --git a/src/racial.c b/src/racial.c
index 4298161..080b005 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -101,8 +101,6 @@ static bool do_cmd_archer(void)
                else
                {
                        s16b slot;
-
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Hack -- Give the player some small firestones */
@@ -136,7 +134,6 @@ static bool do_cmd_archer(void)
 
                item_tester_hook = item_tester_hook_convertible;
 
-               /* Get an item */
                q = _("どのアイテムから作りますか？ ", "Convert which item? ");
                s = _("材料を持っていない。", "You have no item to convert.");
                if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return FALSE;
@@ -152,8 +149,6 @@ static bool do_cmd_archer(void)
                {
                        q_ptr = &o_list[0 - item];
                }
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Hack -- Give the player some small firestones */
@@ -195,7 +190,6 @@ static bool do_cmd_archer(void)
 
                item_tester_hook = item_tester_hook_convertible;
 
-               /* Get an item */
                q = _("どのアイテムから作りますか？ ", "Convert which item? ");
                s = _("材料を持っていない。", "You have no item to convert.");
                if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return FALSE;
@@ -211,8 +205,6 @@ static bool do_cmd_archer(void)
                {
                        q_ptr = &o_list[0 - item];
                }
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Hack -- Give the player some small firestones */
@@ -264,7 +256,6 @@ bool gain_magic(void)
        /* Only accept legal items */
        item_tester_hook = item_tester_hook_recharge;
 
-       /* Get an item */
        q = _("どのアイテムの魔力を取り込みますか? ", "Gain power of which item? ");
        s = _("魔力を取り込めるアイテムがない。", "You have nothing to gain power.");
 
@@ -335,7 +326,6 @@ bool gain_magic(void)
        }
 
        object_desc(o_name, o_ptr, 0);
-       /* Message */
        msg_format(_("%sの魔力を取り込んだ。", "You absorb magic of %s."), o_name);
 
        /* Eliminate the item (from the pack) */
@@ -399,8 +389,6 @@ static bool choose_kamae(void)
                msg_print(_("混乱していて構えられない！", "Too confused."));
                return FALSE;
        }
-
-       /* Save screen */
        screen_save();
        prt(_(" a) 構えをとく", " a) No form"), 2, 20);
 
@@ -504,8 +492,6 @@ static bool choose_kata(void)
                msg_print(_("体が震えて構えられない！", "You are trembling with fear!"));
                return FALSE;
        }
-
-       /* Save screen */
        screen_save();
        prt(_(" a) 型を崩す", " a) No Form"), 2, 20);
 
@@ -747,8 +733,8 @@ static int racial_aux(power_desc_type *pd_ptr)
  */
 static bool cmd_racial_power_aux(s32b command)
 {
-       s16b        plev = p_ptr->lev;
-       int         dir = 0;
+       PLAYER_LEVEL plev = p_ptr->lev;
+       DIRECTION dir = 0;
 
        if (command <= -3)
        {
@@ -1224,8 +1210,6 @@ static bool cmd_racial_power_aux(s32b command)
                        {
                                object_type *q_ptr;
                                object_type forge;
-
-                               /* Get local object */
                                q_ptr = &forge;
 
                                /* Create the food ration */
@@ -2566,9 +2550,7 @@ void do_cmd_racial_power(void)
                                _("(特殊能力 %c-%c, *'で一覧, ESCで中断) どの特殊能力を使いますか？", "(Powers %c-%c, *=List, ESC=exit) Use which power? "),
                                I2A(0), (num <= 26) ? I2A(num - 1) : '0' + num - 27);
 
-#ifdef ALLOW_REPEAT
 if (!repeat_pull(&i) || i<0 || i>=num) {
-#endif /* ALLOW_REPEAT */
        if (use_menu) screen_save();
         /* Get a spell from the user */
 
@@ -2640,7 +2622,7 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
                                int ctr = 0;
                                char dummy[80];
                                char letter;
-                               TERM_POSITION x1, y1;
+                               TERM_LEN x1, y1;
 
                                strcpy(dummy, "");
 
@@ -2758,10 +2740,8 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
                p_ptr->energy_use = 0;
                return;
        }
-#ifdef ALLOW_REPEAT
        repeat_push(i);
        } /*if (!repeat_pull(&i) || ...)*/
-#endif /* ALLOW_REPEAT */
        switch (racial_aux(&power_desc[i]))
        {
        case 1:
@@ -2796,7 +2776,6 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
                        /* Redraw mana and hp */
                        p_ptr->redraw |= (PR_HP | PR_MANA);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER | PW_SPELL);
                }
        }