[Fix] GF_CHARM_LIVING改名に伴うspell-xx.prf修正。 / Fix spell-xx.prf for rename of GF_CHARM_L...

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

diff --git a/src/effects.c b/src/effects.c
index 4e0c9b5..d8b790b 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -21,7 +21,7 @@
  * #ACTION_NONE / #ACTION_SEARCH / #ACTION_REST / #ACTION_LEARN / #ACTION_FISH / #ACTION_KAMAE / #ACTION_KATA / #ACTION_SING / #ACTION_HAYAGAKE / #ACTION_SPELL から選択。
  * @return なし
  */
-void set_action(int typ)
+void set_action(ACTION_IDX typ)
 {
        int prev_typ = p_ptr->action;
 
@@ -206,8 +206,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 +268,8 @@ void dispel_player(void)
        if (music_singing_any() || hex_spelling_any())
        {
                cptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling");
-               p_ptr->magic_num1[1] = p_ptr->magic_num1[0];
-               p_ptr->magic_num1[0] = 0;
+               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;
 
@@ -3729,7 +3729,8 @@ bool inc_stat(int stat)
 bool dec_stat(int stat, int amount, int permanent)
 {
        BASE_STATUS cur, max;
-       int loss, same, res = FALSE;
+       int loss, same;
+       bool res = FALSE;
 
 
        /* Acquire current value */
@@ -4328,7 +4329,7 @@ void do_poly_self(void)
 
                do
                {
-                       new_race = randint0(MAX_RACES);
+                       new_race = (CHARACTER_IDX)randint0(MAX_RACES);
                }
                while ((new_race == p_ptr->prace) || (new_race == RACE_ANDROID));
 
@@ -4401,7 +4402,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);