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

[hengband/hengband.git] / src / realm-song.c

diff --git a/src/realm-song.c b/src/realm-song.c
index 6091316..ba614c0 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -19,8 +19,6 @@ static void start_singing(SPELL_IDX spell, MAGIC_NUM1 song)
        /* Now the player is singing */
        set_action(ACTION_SING);
 
-
-       /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
 
        /* Redraw status bar */
@@ -54,8 +52,6 @@ void stop_singing(void)
 
        SINGING_SONG_EFFECT(p_ptr) = MUSIC_NONE;
        SINGING_SONG_ID(p_ptr) = 0;
-
-       /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
 
        /* Redraw status bar */
@@ -68,7 +64,7 @@ void stop_singing(void)
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_FAIL / SPELL_CONT / SPELL_STOP 時はNULL文字列を返す。
 */
-cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -77,7 +73,6 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool fail = (mode == SPELL_FAIL) ? TRUE : FALSE;
        bool cont = (mode == SPELL_CONT) ? TRUE : FALSE;
        bool stop = (mode == SPELL_STOP) ? TRUE : FALSE;
-       static const char s_dam[] = _("損傷:", "dam ");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;
@@ -250,7 +245,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cont)
                        {
-                               project_hack(GF_TURN_ALL, power);
+                               project_all_los(GF_TURN_ALL, power);
                        }
                }
 
@@ -335,7 +330,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                        detect_monsters_invis(rad);
                                        detect_monsters_normal(rad);
 
-                                       if (plev > 19 && count < 6)
+                                       if (plev > 19 && count < A_MAX)
                                                SINGING_COUNT(p_ptr) = count + 1;
                                }
                                detect_traps(rad, TRUE);
@@ -370,7 +365,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cont)
                        {
-                               project_hack(GF_PSI, damroll(dice, sides));
+                               project_all_los(GF_PSI, damroll(dice, sides));
                        }
                }
 
@@ -476,7 +471,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cont)
                        {
-                               project_hack(GF_SOUND, damroll(dice, sides));
+                               project_all_los(GF_SOUND, damroll(dice, sides));
                        }
                }