[Refactor] #37353 ホビットの食用生成を create_ration() に分離。 / Separate Hobbit's racial skill...

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

diff --git a/src/realm-song.c b/src/realm-song.c
index a479e92..972ce42 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "cmd-spell.h"
+#include "projection.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard
@@ -64,7 +65,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;
@@ -73,7 +74,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;
@@ -331,7 +331,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);