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

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 4c9b2ff..bdafa0b 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -2207,7 +2207,7 @@ void do_cmd_rest(void)
 
        if (command_arg > 9999) command_arg = 9999;
 
-       if (p_ptr->special_defense & NINJA_S_STEALTH) set_superstealth(FALSE);
+       if (p_ptr->special_defense & NINJA_S_STEALTH) set_superstealth(p_ptr, FALSE);
 
        /* Take a current_world_ptr->game_turn (?) */
        take_turn(p_ptr, 100);

diff --git a/src/core.c b/src/core.c
index acfcc31..5e9227e 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5038,7 +5038,7 @@ static void dungeon(bool load_game)
 #endif
        }
 
-       if (!load_game && (p_ptr->special_defense & NINJA_S_STEALTH)) set_superstealth(FALSE);
+       if (!load_game && (p_ptr->special_defense & NINJA_S_STEALTH)) set_superstealth(p_ptr, FALSE);
 
        /*** Process this dungeon level ***/
 

diff --git a/src/floor-events.c b/src/floor-events.c
index 9eecdeb..0c5a63a 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -51,7 +51,7 @@ void day_break()
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
        }
 
 }
@@ -99,7 +99,7 @@ void night_falls(void)
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
        }
 
 }

diff --git a/src/floor-save.c b/src/floor-save.c
index 9d7b621..9b30f03 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -873,7 +873,7 @@ void leave_floor(BIT_FLAGS floor_mode)
        /* Remove all mirrors without explosion */
        remove_all_mirrors(FALSE);
 
-       if (p_ptr->special_defense & NINJA_S_STEALTH) set_superstealth(FALSE);
+       if (p_ptr->special_defense & NINJA_S_STEALTH) set_superstealth(p_ptr, FALSE);
 
        /* New floor is not yet prepared */
        new_floor_id = 0;

diff --git a/src/grid.c b/src/grid.c
index 5b649b7..014f3f4 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -1968,7 +1968,7 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 
                if (p_ptr->special_defense & NINJA_S_STEALTH)
                {
-                       if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+                       if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
                }
        }
 }

diff --git a/src/monster-status.c b/src/monster-status.c
index d7a172f..2a5c76f 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1040,7 +1040,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note)
        /* Hack - Cancel any special player stealth magics. -LM- */
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               set_superstealth(FALSE);
+               set_superstealth(p_ptr, FALSE);
        }
 
        /* Genocided by chaos patron */

diff --git a/src/player-effects.c b/src/player-effects.c
index 3f1caef..79e107c 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -1682,51 +1682,51 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
  * @param set TRUEならば超隠密状態になる。
  * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
  */
-bool set_superstealth(bool set)
+bool set_superstealth(player_type *creature_ptr, bool set)
 {
        bool notice = FALSE;
 
-       if (p_ptr->is_dead) return FALSE;
+       if (creature_ptr->is_dead) return FALSE;
 
        /* Open */
        if (set)
        {
-               if (!(p_ptr->special_defense & NINJA_S_STEALTH))
+               if (!(creature_ptr->special_defense & NINJA_S_STEALTH))
                {
-                       if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_MNLT)
+                       if (current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_MNLT)
                        {
                                msg_print(_("敵の目から薄い影の中に覆い隠された。", "You are mantled in weak shadow from ordinary eyes."));
-                               p_ptr->monlite = p_ptr->old_monlite = TRUE;
+                               creature_ptr->monlite = creature_ptr->old_monlite = TRUE;
                        }
                        else
                        {
                                msg_print(_("敵の目から影の中に覆い隠された！", "You are mantled in shadow from ordinary eyes!"));
-                               p_ptr->monlite = p_ptr->old_monlite = FALSE;
+                               creature_ptr->monlite = creature_ptr->old_monlite = FALSE;
                        }
 
                        notice = TRUE;
 
                        /* Use the value */
-                       p_ptr->special_defense |= NINJA_S_STEALTH;
+                       creature_ptr->special_defense |= NINJA_S_STEALTH;
                }
        }
 
        /* Shut */
        else
        {
-               if (p_ptr->special_defense & NINJA_S_STEALTH)
+               if (creature_ptr->special_defense & NINJA_S_STEALTH)
                {
                        msg_print(_("再び敵の目にさらされるようになった。", "You are exposed to common sight once more."));
                        notice = TRUE;
 
                        /* Use the value */
-                       p_ptr->special_defense &= ~(NINJA_S_STEALTH);
+                       creature_ptr->special_defense &= ~(NINJA_S_STEALTH);
                }
        }
 
        /* Nothing to notice */
        if (!notice) return (FALSE);
-       p_ptr->redraw |= (PR_STATUS);
+       creature_ptr->redraw |= (PR_STATUS);
 
        if (disturb_state) disturb(FALSE, FALSE);
        return (TRUE);

diff --git a/src/player-effects.h b/src/player-effects.h
index 7f5fb7c..6aee965 100644 (file)
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -79,7 +79,7 @@ extern bool choose_ele_attack(void);
 extern bool choose_ele_immune(TIME_EFFECT turn);
 extern bool set_wraith_form(TIME_EFFECT v, bool do_dec);
 extern bool set_tim_esp(TIME_EFFECT v, bool do_dec);
-extern bool set_superstealth(bool set);
+extern bool set_superstealth(player_type *creature_ptr, bool set);
 extern void do_poly_wounds(player_type *creature_ptr);
 extern void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effect_msg);
 

diff --git a/src/player-move.c b/src/player-move.c
index 3fdc82f..94e2be3 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -668,8 +668,8 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
 
                if (p_ptr->pclass == CLASS_NINJA)
                {
-                       if (g_ptr->info & (CAVE_GLOW)) set_superstealth(FALSE);
-                       else if (p_ptr->cur_lite <= 0) set_superstealth(TRUE);
+                       if (g_ptr->info & (CAVE_GLOW)) set_superstealth(p_ptr, FALSE);
+                       else if (p_ptr->cur_lite <= 0) set_superstealth(p_ptr, TRUE);
                }
 
                if ((p_ptr->action == ACTION_HAYAGAKE) &&

diff --git a/src/player-status.c b/src/player-status.c
index 51f13c2..255b28a 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -4162,7 +4162,7 @@ static void calc_torch(void)
                p_ptr->old_lite = p_ptr->cur_lite;
 
                if ((p_ptr->cur_lite > 0) && (p_ptr->special_defense & NINJA_S_STEALTH))
-                       set_superstealth(FALSE);
+                       set_superstealth(p_ptr, FALSE);
        }
 }
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index e38be93..dcf0dd9 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -123,7 +123,7 @@ void wiz_lite(bool ninja)
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
        }
 }
 
@@ -706,7 +706,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 
                if (p_ptr->special_defense & NINJA_S_STEALTH)
                {
-                       if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+                       if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
                }
        }
 
@@ -1151,7 +1151,7 @@ bool earthquake(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
        }
 
        /* Success */

diff --git a/src/spells1.c b/src/spells1.c
index a720744..26543e0 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -586,7 +586,7 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                if (p_ptr->special_defense & NINJA_S_STEALTH)
                                {
-                                       if (player_bold(y, x)) set_superstealth(FALSE);
+                                       if (player_bold(y, x)) set_superstealth(p_ptr, FALSE);
                                }
                        }
 

diff --git a/src/spells2.c b/src/spells2.c
index 8345490..c9501a1 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1779,7 +1779,7 @@ void lite_room(POSITION y1, POSITION x1)
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
        {
-               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(FALSE);
+               if (current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].info & CAVE_GLOW) set_superstealth(p_ptr, FALSE);
        }
 }