[Refactor] #38997 lose_all_mutations() に player_type * 引数を追加．

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 2753d0c..50111d3 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -470,7 +470,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
                        roll_hitdice(p_ptr, 0L);
                        get_max_stats();
                        p_ptr->update |= PU_BONUS;
-                       lose_all_mutations();
+                       lose_all_mutations(p_ptr);
                        ident = TRUE;
                        break;
 
@@ -495,7 +495,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
                case SV_POTION_POLYMORPH:
                        if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && one_in_(23))
                        {
-                               lose_all_mutations();
+                               lose_all_mutations(p_ptr);
                        }
                        else
                        {

diff --git a/src/mutation.c b/src/mutation.c
index 211424b..3123740 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -1501,16 +1501,16 @@ bool lose_mutation(MUTATION_IDX choose_mut)
        }
 }
 
-void lose_all_mutations(void)
+void lose_all_mutations(player_type *creature_ptr)
 {
-       if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3)
+       if (creature_ptr->muta1 || creature_ptr->muta2 || creature_ptr->muta3)
        {
                chg_virtue(V_CHANCE, -5);
                msg_print(_("全ての突然変異が治った。", "You are cured of all mutations."));
-               p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0;
-               p_ptr->update |= PU_BONUS;
+               creature_ptr->muta1 = creature_ptr->muta2 = creature_ptr->muta3 = 0;
+               creature_ptr->update |= PU_BONUS;
                handle_stuff();
-               p_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod();
+               creature_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod();
        }
 }
 

diff --git a/src/mutation.h b/src/mutation.h
index 3df681f..e58c0fb 100644 (file)
--- a/src/mutation.h
+++ b/src/mutation.h
@@ -1,7 +1,7 @@
 /* mutation.c */
 extern bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut);
 extern bool lose_mutation(MUTATION_IDX choose_mut);
-extern void lose_all_mutations(void);
+extern void lose_all_mutations(player_type *creature_ptr);
 extern void dump_mutations(FILE *OutFile);
 extern void do_cmd_knowledge_mutations(void);
 extern int calc_mutant_regenerate_mod(void);

diff --git a/src/spells2.c b/src/spells2.c
index 3b86942..02c7669 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3815,7 +3815,7 @@ void cast_shuffle(void)
        {
                msg_print(_("《審判》だ。", "It's the Judgement."));
                roll_hitdice(p_ptr, 0L);
-               lose_all_mutations();
+               lose_all_mutations(p_ptr);
        }
        else if (die < 120)
        {