Merge branch 'Fix2.2.0Bugs'

[hengband/hengband.git] / src / do-spell.c

diff --git a/src/do-spell.c b/src/do-spell.c
index 75cf04d..03ec074 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -740,13 +740,7 @@ static void cast_shuffle(void)
        {
                msg_print(_("《審判》だ。", "It's the Judgement."));
                do_cmd_rerate(FALSE);
-               if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3)
-               {
-                       msg_print(_("全ての突然変異が治った。", "You are cured of all mutations."));
-                       p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-                       p_ptr->update |= PU_BONUS;
-                       handle_stuff();
-               }
+               lose_all_mutations();
        }
        else if (die < 120)
        {
@@ -989,10 +983,10 @@ static bool cast_summon_greater_demon(void)
 static void start_singing(SPELL_IDX spell, MAGIC_NUM1 song)
 {
        /* Remember the song index */
-       SINGING_SONG_EFFECT(p_ptr) = (MAGIC_NUM2)song;
+       SINGING_SONG_EFFECT(p_ptr) = (MAGIC_NUM1)song;
 
        /* Remember the index of the spell which activated the song */
-       SINGING_SONG_ID(p_ptr) = (SPELL_IDX)spell;
+       SINGING_SONG_ID(p_ptr) = (MAGIC_NUM2)spell;
 
 
        /* Now the player is singing */