[Refactor] #37353 monster1～monster-hook間整理。 / Refactor between monster1 and monster...

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

diff --git a/src/hissatsu.c b/src/hissatsu.c
index e08c2c3..5851735 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "monster-hook.h"
 
 #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC)
 
@@ -36,25 +37,23 @@ static int get_hissatsu_power(SPELL_IDX *sn)
 {
        SPELL_IDX i;
        int j = 0;
-       int             num = 0;
-       int             y = 1;
-       int             x = 15;
-       int             plev = p_ptr->lev;
-       int             ask = TRUE;
-       char            choice;
-       char            out_val[160];
+       int num = 0;
+       POSITION y = 1;
+       POSITION x = 15;
+       PLAYER_LEVEL plev = p_ptr->lev;
+       int ask = TRUE;
+       char choice;
+       char out_val[160];
        SPELL_IDX sentaku[32];
-       cptr            p = _("必殺剣", "special attack");
+       cptr p = _("必殺剣", "special attack");
        COMMAND_CODE code;
        magic_type spell;
-       bool            flag, redraw;
+       bool flag, redraw;
        int menu_line = (use_menu ? 1 : 0);
 
        /* Assume cancelled */
        *sn = (-1);
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        /* Get the spell, if available */
        if (repeat_pull(&code))
        {
@@ -67,8 +66,6 @@ static int get_hissatsu_power(SPELL_IDX *sn)
                }
        }
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Nothing chosen yet */
        flag = FALSE;
 
@@ -299,7 +296,6 @@ static int get_hissatsu_power(SPELL_IDX *sn)
        /* Show choices */
        p_ptr->window |= (PW_SPELL);
 
-       /* Window stuff */
        window_stuff();
 
 
@@ -309,12 +305,8 @@ static int get_hissatsu_power(SPELL_IDX *sn)
        /* Save the choice */
        (*sn) = j;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        repeat_push((COMMAND_CODE)j);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Success */
        return (TRUE);
 }
@@ -329,7 +321,6 @@ void do_cmd_hissatsu(void)
        SPELL_IDX       n = 0;
        magic_type      spell;
 
-
        /* not if confused */
        if (p_ptr->confused)
        {
@@ -373,7 +364,6 @@ void do_cmd_hissatsu(void)
        /* Cast the spell */
        if (!do_spell(REALM_HISSATSU, n, SPELL_CAST)) return;
 
-       /* Take a turn */
        p_ptr->energy_use = 100;
 
        /* Use some mana */
@@ -385,7 +375,6 @@ void do_cmd_hissatsu(void)
        /* Redraw mana */
        p_ptr->redraw |= (PR_MANA);
 
-       /* Window stuff */
        p_ptr->window |= (PW_PLAYER);
        p_ptr->window |= (PW_SPELL);
 }
@@ -441,7 +430,6 @@ void do_cmd_gain_hissatsu(void)
 
        item_tester_tval = TV_HISSATSU_BOOK;
 
-       /* Get an item */
        q = _("どの書から学びますか? ", "Study which book? ");
        s = _("読める書がない。", "You have no books that you can read.");
 
@@ -480,7 +468,6 @@ void do_cmd_gain_hissatsu(void)
        if (!gain)
                msg_print(_("何も覚えられなかった。", "You were not able to learn any special attacks."));
 
-       /* Take a turn */
        else
                p_ptr->energy_use = 100;