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

diff --git a/src/player-effects.c b/src/player-effects.c
index f4a3e03..7514ce2 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -4286,7 +4286,7 @@ bool choose_ele_attack(void)
 /*
  * Choose a elemental immune. -LM-
  */
-bool choose_ele_immune(TIME_EFFECT immune_turn)
+bool choose_ele_immune(player_type *creature_ptr, TIME_EFFECT immune_turn)
 {
        char choice;
        screen_save();
@@ -4307,13 +4307,13 @@ bool choose_ele_immune(TIME_EFFECT immune_turn)
        choice = inkey();
 
        if ((choice == 'a') || (choice == 'A')) 
-               set_ele_immune(p_ptr, DEFENSE_FIRE, immune_turn);
+               set_ele_immune(creature_ptr, DEFENSE_FIRE, immune_turn);
        else if ((choice == 'b') || (choice == 'B'))
-               set_ele_immune(p_ptr, DEFENSE_COLD, immune_turn);
+               set_ele_immune(creature_ptr, DEFENSE_COLD, immune_turn);
        else if ((choice == 'c') || (choice == 'C'))
-               set_ele_immune(p_ptr, DEFENSE_ACID, immune_turn);
+               set_ele_immune(creature_ptr, DEFENSE_ACID, immune_turn);
        else if ((choice == 'd') || (choice == 'D'))
-               set_ele_immune(p_ptr, DEFENSE_ELEC, immune_turn);
+               set_ele_immune(creature_ptr, DEFENSE_ELEC, immune_turn);
        else
        {
                msg_print(_("免疫を付けるのをやめた。", "You cancel the temporary immune."));

diff --git a/src/player-effects.h b/src/player-effects.h
index bacc722..ec816d9 100644 (file)
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -76,7 +76,7 @@ extern bool set_ultimate_res(TIME_EFFECT v, bool do_dec);
 extern bool set_tim_res_nether(TIME_EFFECT v, bool do_dec);
 extern bool set_tim_res_time(TIME_EFFECT v, bool do_dec);
 extern bool choose_ele_attack(void);
-extern bool choose_ele_immune(TIME_EFFECT turn);
+extern bool choose_ele_immune(player_type *creature_ptr, TIME_EFFECT turn);
 extern bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec);
 extern bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec);
 extern bool set_superstealth(player_type *creature_ptr, bool set);

diff --git a/src/realm-craft.c b/src/realm-craft.c
index 9deb669..753073b 100644 (file)
--- a/src/realm-craft.c
+++ b/src/realm-craft.c
@@ -499,7 +499,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!choose_ele_immune(base + randint1(base))) return NULL;
+                               if (!choose_ele_immune(p_ptr, base + randint1(base))) return NULL;
                        }
                }
                break;