[Refactor] #37353 mon_take_hit() のコメントアウト済落馬処理を削除。 / Delete comment outed process...

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

diff --git a/src/mspells3.c b/src/mspells3.c
index 865b402..d39543a 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -23,7 +23,7 @@
 * @param tmp 返すメッセージを格納する配列
 * @return なし
 */
-void set_bluemage_damage(int SPELL_NUM, int plev, cptr msg, char* tmp)
+void set_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, cptr msg, char* tmp)
 {
     int base_damage = monspell_bluemage_damage(SPELL_NUM, plev, BASE_DAM);
     int dice_num = monspell_bluemage_damage(SPELL_NUM, plev, DICE_NUM);
@@ -43,7 +43,7 @@ void set_bluemage_damage(int SPELL_NUM, int plev, cptr msg, char* tmp)
  */
 static void learned_info(char *p, int power)
 {
-       int plev = pseudo_plev();
+       PLAYER_LEVEL plev = pseudo_plev();
 
 #ifdef JP
        cptr s_dam = " 損傷:%s";
@@ -230,8 +230,6 @@ static int get_learned_power(SPELL_IDX *sn)
        /* No redraw yet */
        redraw = FALSE;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        /* Get the spell, if available */
        
        if (repeat_pull(&code))
@@ -241,8 +239,6 @@ static int get_learned_power(SPELL_IDX *sn)
        }
        *sn = (SPELL_IDX)code;
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        if (use_menu)
        {
                screen_save();
@@ -578,7 +574,6 @@ static int get_learned_power(SPELL_IDX *sn)
        /* Show choices */
        p_ptr->window |= (PW_SPELL);
 
-       /* Window stuff */
        window_stuff();
 
        /* Abort if needed */
@@ -587,12 +582,8 @@ static int get_learned_power(SPELL_IDX *sn)
        /* Save the choice */
        (*sn) = spellnum[i];
 
-#ifdef ALLOW_REPEAT /* TNB */
-
        repeat_push((COMMAND_CODE)spellnum[i]);
 
-#endif /* ALLOW_REPEAT -- TNB */
-
        /* Success */
        return (TRUE);
 }
@@ -697,7 +688,7 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
         damage = monspell_bluemage_damage((MS_BR_COLD), plev, DAM_ROLL);
-               fire_ball(GF_COLD, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_COLD, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_POIS:
         if (!get_aim_dir(&dir)) return FALSE;
@@ -1080,13 +1071,11 @@ static bool cast_learned_spell(int spell, bool success)
                /* Hack */
                p_ptr->energy_need -= 1000 + (100 + randint1(200)+200)*TURNS_PER_TICK/10;
 
-               /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
 
                /* Update monsters */
                p_ptr->update |= (PU_MONSTERS);
 
-               /* Window stuff */
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                handle_stuff();
@@ -1569,7 +1558,6 @@ bool do_cmd_cast_learned(void)
                p_ptr->csp = 0;
                p_ptr->csp_frac = 0;
 
-               /* Message */
                msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!"));
 
                /* Hack -- Bypass free action */
@@ -1582,7 +1570,6 @@ bool do_cmd_cast_learned(void)
                {
                        bool perm = (randint0(100) < 25);
 
-                       /* Message */
                        msg_print(_("体を悪くしてしまった！", "You have damaged your health!"));
 
                        /* Reduce constitution */
@@ -1590,10 +1577,8 @@ bool do_cmd_cast_learned(void)
                }
        }
 
-       /* Take a turn */
        p_ptr->energy_use = 100;
 
-       /* Window stuff */
        p_ptr->redraw |= (PR_MANA);
        p_ptr->window |= (PW_PLAYER);
        p_ptr->window |= (PW_SPELL);
@@ -1618,7 +1603,6 @@ void learn_spell(int monspell)
                msg_format(_("%sを学習した！", "You have learned %s!"), monster_powers[monspell].name);
                gain_exp(monster_powers[monspell].level * monster_powers[monspell].smana);
 
-               /* Sound */
                sound(SOUND_STUDY);
 
                new_mane = TRUE;