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

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

diff --git a/src/hissatsu.c b/src/hissatsu.c
index 6626efd..e08c2c3 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -45,7 +45,7 @@ static int get_hissatsu_power(SPELL_IDX *sn)
        char            out_val[160];
        SPELL_IDX sentaku[32];
        cptr            p = _("必殺剣", "special attack");
-
+       COMMAND_CODE code;
        magic_type spell;
        bool            flag, redraw;
        int menu_line = (use_menu ? 1 : 0);
@@ -56,8 +56,9 @@ static int get_hissatsu_power(SPELL_IDX *sn)
 #ifdef ALLOW_REPEAT /* TNB */
 
        /* Get the spell, if available */
-       if (repeat_pull(sn))
+       if (repeat_pull(&code))
        {
+               *sn = (SPELL_IDX)code;
                /* Verify the spell */
                if (technic_info[TECHNIC_HISSATSU][*sn].slevel <= plev)
                {
@@ -310,7 +311,7 @@ static int get_hissatsu_power(SPELL_IDX *sn)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-       repeat_push(*sn);
+       repeat_push((COMMAND_CODE)j);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -496,7 +497,7 @@ void do_cmd_gain_hissatsu(void)
  * @param mode 剣術のスレイ型ID
  * @return スレイの倍率(/10倍)
  */
-MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, int mode)
+MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode)
 {
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
@@ -650,7 +651,7 @@ MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, int
        /* Bloody Maelstrom */
        if ((mode == HISSATSU_SEKIRYUKA) && p_ptr->cut && monster_living(r_ptr))
        {
-               int tmp = MIN(100, MAX(10, p_ptr->cut / 10));
+               MULTIPLY tmp = MIN(100, MAX(10, p_ptr->cut / 10));
                if (mult < tmp) mult = tmp;
        }