[Refactor] #37353 型の置換。 / Type replacement.

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

diff --git a/src/cmd5.c b/src/cmd5.c
index 7b0a4ab..fcee3f1 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 */
@@ -325,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;
 }
@@ -398,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))
        {
@@ -407,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);
 
@@ -421,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;
                }
        }
@@ -495,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.");
 
@@ -531,8 +514,6 @@ void do_cmd_browse(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
 
@@ -708,7 +689,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.");
 
@@ -739,8 +719,6 @@ void do_cmd_study(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Mage -- Learn a selected spell */
@@ -985,7 +963,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!");
 
@@ -1022,8 +999,6 @@ void do_cmd_cast(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        if ((p_ptr->pclass == CLASS_SORCERER) || (p_ptr->pclass == CLASS_RED_MAGE))