[Refactor] #37353 ソースファイル改名。

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

diff --git a/src/effects.c b/src/effects.c
index 7bcdd23..1b66d0a 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -12,7 +12,6 @@
  * 2013 Deskull rearranged comment for Doxygen.\n
  */
 
-
 #include "angband.h"
 
 /*!
@@ -206,8 +205,8 @@ void reset_tim_flags(void)
 
        if (p_ptr->pclass == CLASS_BARD)
        {
-               p_ptr->magic_num1[0] = 0;
-               p_ptr->magic_num2[0] = 0;
+               SINGING_SONG_EFFECT(p_ptr) = 0;
+               SINGING_SONG_ID(p_ptr) = 0;
        }
 }
 
@@ -268,8 +267,8 @@ void dispel_player(void)
        if (music_singing_any() || hex_spelling_any())
        {
                cptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling");
-               INTERUPTING_SONG_ID(p_ptr) = SINGING_SONG_ID(p_ptr);
-               SINGING_SONG_ID(p_ptr) = MUSIC_NONE;
+               INTERUPTING_SONG_EFFECT(p_ptr) = SINGING_SONG_EFFECT(p_ptr);
+               SINGING_SONG_EFFECT(p_ptr) = MUSIC_NONE;
                msg_format(_("%sが途切れた。", "Your %s is interrupted."), str);
                p_ptr->action = ACTION_NONE;
 
@@ -4402,7 +4401,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
        int old_chp = p_ptr->chp;
 
        char death_message[1024];
-       char tmp[80];
+       char tmp[1024];
 
        int warning = (p_ptr->mhp * hitpoint_warn / 10);
 
@@ -5205,3 +5204,4 @@ bool choose_ele_immune(TIME_EFFECT immune_turn)
        screen_load();
        return TRUE;
 }
+