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

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

diff --git a/src/mspells4.c b/src/mspells4.c
index 0797f9d..1e06f66 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -39,7 +39,7 @@ bool monster_near_player(MONSTER_IDX m_idx, IDX t_idx)
 */
 bool see_monster(MONSTER_IDX m_idx)
 {
-       monster_type    *m_ptr = &m_list[m_idx];
+       monster_type *m_ptr = &m_list[m_idx];
        return is_seen(m_ptr);
 }
 
@@ -50,7 +50,7 @@ bool see_monster(MONSTER_IDX m_idx)
 */
 bool spell_learnable(MONSTER_IDX m_idx)
 {
-       monster_type    *m_ptr = &m_list[m_idx];
+       monster_type *m_ptr = &m_list[m_idx];
        /* Extract the "see-able-ness" */
        bool seen = (!p_ptr->blind && m_ptr->ml);
 
@@ -303,7 +303,7 @@ HIT_POINT spell_RF4_SHOOT(POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx,i
 */
 HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx, int TARGET_TYPE)
 {
-       HIT_POINT dam, ms_type, drs_type;
+       HIT_POINT dam, ms_type, drs_type = 0;
        cptr type_s;
        bool smart_learn_aux = TRUE;
        monster_type    *m_ptr = &m_list[m_idx];
@@ -450,6 +450,11 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
                smart_learn_aux = FALSE;
                break;
        default:
+               /* Do not reach here */
+               dam = 0;
+               type_s = _("不明", "Unknown");
+               ms_type = MS_BR_ACID;
+               smart_learn_aux = FALSE;
                break;
        }
 
@@ -902,7 +907,7 @@ HIT_POINT spell_RF5_MIND_BLAST(POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_
 */
 HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx, int TARGET_TYPE)
 {
-       monster_type    *m_ptr = &m_list[m_idx];
+       monster_type *m_ptr = &m_list[m_idx];
        bool seen = (!p_ptr->blind && m_ptr->ml);
        HIT_POINT dam;
        char m_name[80], t_name[80];
@@ -1937,7 +1942,7 @@ void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
 HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
 {
        monster_type    *m_ptr = &m_list[m_idx];
-       int who = 0;
+       MONSTER_IDX who = 0;
        char m_name[80];
        monster_name(m_idx, m_name);
 
@@ -2056,7 +2061,7 @@ HIT_POINT spell_RF6_SPECIAL_ROLENTO(POSITION y, POSITION x, MONSTER_IDX m_idx, I
 */
 HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx, int TARGET_TYPE)
 {
-       HIT_POINT dam;
+       HIT_POINT dam = -1;
        monster_type    *m_ptr = &m_list[m_idx];
        monster_type    *t_ptr = &m_list[t_idx];
        monster_race    *tr_ptr = &r_info[t_ptr->r_idx];
@@ -2526,7 +2531,7 @@ void spell_RF6_FORGET(MONSTER_IDX m_idx)
 */
 void spell_RF6_RAISE_DEAD(MONSTER_IDX m_idx, IDX t_idx, int TARGET_TYPE)
 {
-       monster_type    *m_ptr = &m_list[m_idx];
+       monster_type *m_ptr = &m_list[m_idx];
 
        monspell_message(m_idx, t_idx,
                _("%^sが何かをつぶやいた。", "%^s mumbles."),
@@ -3609,7 +3614,7 @@ HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX
        case RF6_SPELL_START + 8:  spell_RF6_TELE_TO(m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_TELE_TO */
        case RF6_SPELL_START + 9:  spell_RF6_TELE_AWAY(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_TELE_AWAY */
        case RF6_SPELL_START + 10: spell_RF6_TELE_LEVEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_TELE_LEVEL */
-       case RF6_SPELL_START + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
+       case RF6_SPELL_START + 11: return spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
        case RF6_SPELL_START + 12: spell_RF6_DARKNESS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_DARKNESS */
        case RF6_SPELL_START + 13: return -1; /* RF6_TRAPS */
        case RF6_SPELL_START + 14: return -1;  /* RF6_FORGET */