[Refactor] #define ALLOW_EASY_DISARM による分岐処理削除 / Delete #define branch by ALLOW_EASY_...

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

diff --git a/src/cmd5.c b/src/cmd5.c
index 65fedf0..d8f509f 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -72,8 +72,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 #endif
        int menu_line = (use_menu ? 1 : 0);
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        /* Get the spell, if available */
        if (repeat_pull(&code))
        {
@@ -86,8 +84,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
                }
        }
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        p = spell_category_name(mp_ptr->spell_book);
 
        /* Extract spells */
@@ -132,7 +128,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
        /* Show choices */
        p_ptr->window |= (PW_SPELL);
 
-       /* Window stuff */
        window_stuff();
 
        /* Build a prompt (accept all spells) */
@@ -317,7 +312,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
        /* Show choices */
        p_ptr->window |= (PW_SPELL);
 
-       /* Window stuff */
        window_stuff();
 
 
@@ -327,12 +321,8 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
        /* Save the choice */
        (*sn) = spell;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        repeat_push((COMMAND_CODE)spell);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Success */
        return TRUE;
 }
@@ -400,8 +390,6 @@ static void confirm_use_force(bool browse_only)
        char which;
        COMMAND_CODE code;
 
-#ifdef ALLOW_REPEAT
-
        /* Get the item index */
        if (repeat_pull(&code) && (code == INVEN_FORCE))
        {
@@ -409,8 +397,6 @@ static void confirm_use_force(bool browse_only)
                return;
        }
 
-#endif /* ALLOW_REPEAT */
-
        /* Show the prompt */
        prt(_("('w'練気術, ESC) 'w'かESCを押してください。 ", "(w for the Force, ESC) Hit 'w' or ESC. "), 0, 0);
 
@@ -423,12 +409,8 @@ static void confirm_use_force(bool browse_only)
                else if (which == 'w')
                {
 
-#ifdef ALLOW_REPEAT
-
                        repeat_push(INVEN_FORCE);
 
-#endif /* ALLOW_REPEAT */
-
                        break;
                }
        }
@@ -497,7 +479,6 @@ void do_cmd_browse(void)
        if (p_ptr->realm2 == REALM_NONE) item_tester_tval = mp_ptr->spell_book;
        else item_tester_hook = item_tester_learn_spell;
 
-       /* Get an item */
        q = _("どの本を読みますか? ", "Browse which book? ");
        s = _("読める本がない。", "You have no books that you can read.");
 
@@ -710,7 +691,6 @@ void do_cmd_study(void)
        if (p_ptr->realm2 == REALM_NONE) item_tester_tval = mp_ptr->spell_book;
        else item_tester_hook = item_tester_learn_spell;
 
-       /* Get an item */
        q = _("どの本から学びますか? ", "Study which book? ");
        s = _("読める本がない。", "You have no books that you can read.");
 
@@ -783,7 +763,6 @@ void do_cmd_study(void)
        /* Nothing to study */
        if (spell < 0)
        {
-               /* Message */
                msg_format(_("その本には学ぶべき%sがない。", "You cannot learn any %ss in that book."), p);
 
                /* Abort */
@@ -878,7 +857,6 @@ void do_cmd_study(void)
 #endif
        }
 
-       /* Take a turn */
        p_ptr->energy_use = 100;
 
        switch (mp_ptr->spell_book)
@@ -897,7 +875,6 @@ void do_cmd_study(void)
                break;
        }
 
-       /* Sound */
        sound(SOUND_STUDY);
 
        /* One less spell available */
@@ -990,7 +967,6 @@ void do_cmd_cast(void)
        /* Restrict choices to spell books */
        item_tester_tval = mp_ptr->spell_book;
 
-       /* Get an item */
        q = _("どの呪文書を使いますか? ", "Use which book? ");
        s = _("呪文書がない！", "You have no spell books!");
 
@@ -1319,7 +1295,6 @@ void do_cmd_cast(void)
                }
        }
 
-       /* Take a turn */
        p_ptr->energy_use = 100;
 
 
@@ -1332,7 +1307,6 @@ void do_cmd_cast(void)
                p_ptr->csp = 0;
                p_ptr->csp_frac = 0;
 
-               /* Message */
                msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!"));
 
                /* Hack -- Bypass free action */
@@ -1368,7 +1342,6 @@ void do_cmd_cast(void)
                {
                        bool perm = (randint0(100) < 25);
 
-                       /* Message */
                        msg_print(_("体を悪くしてしまった！", "You have damaged your health!"));
 
                        /* Reduce constitution */
@@ -1376,7 +1349,6 @@ void do_cmd_cast(void)
                }
        }
 
-       /* Window stuff */
        p_ptr->window |= (PW_PLAYER);
        p_ptr->window |= (PW_SPELL);
 }