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

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 3334df1..c8f3fd1 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -2129,7 +2129,7 @@ void do_cmd_run(player_type *creature_ptr)
  * @param pickup アイテムの自動拾いを行うならTRUE
  * @return なし
  */
-void do_cmd_stay(bool pickup)
+void do_cmd_stay(player_type *creature_ptr, bool pickup)
 {
        u32b mpe_mode = MPE_STAYING | MPE_ENERGY_USE;
 
@@ -2138,16 +2138,16 @@ void do_cmd_stay(bool pickup)
        {
                /* Set repeat count */
                command_rep = command_arg - 1;
-               p_ptr->redraw |= (PR_STATE);
+               creature_ptr->redraw |= (PR_STATE);
 
                /* Cancel the arg */
                command_arg = 0;
        }
 
-       take_turn(p_ptr, 100);
+       take_turn(creature_ptr, 100);
 
        if (pickup) mpe_mode |= MPE_DO_PICKUP;
-       (void)move_player_effect(p_ptr, p_ptr->y, p_ptr->x, mpe_mode);
+       (void)move_player_effect(creature_ptr, creature_ptr->y, creature_ptr->x, mpe_mode);
 }
 
 

diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index 7b07480..17678c9 100644 (file)
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -20,7 +20,7 @@ extern void do_cmd_bash(player_type *creature_ptr);
 extern void do_cmd_alter(void);
 extern void do_cmd_spike(player_type *creature_ptr);
 extern void do_cmd_walk(player_type *creature_ptr, bool pickup);
-extern void do_cmd_stay(bool pickup);
+extern void do_cmd_stay(player_type *creature_ptr, bool pickup);
 extern void do_cmd_run(player_type *creature_ptr);
 extern void do_cmd_rest(player_type *creature_ptr);
 extern void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type);

diff --git a/src/core.c b/src/core.c
index 86594fd..093d949 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3684,14 +3684,14 @@ static void process_command(void)
                /* Stay still (usually pick things up) */
                case ',':
                {
-                       do_cmd_stay(always_pickup);
+                       do_cmd_stay(p_ptr, always_pickup);
                        break;
                }
 
                /* Stay still (usually do not pick up) */
                case 'g':
                {
-                       do_cmd_stay(!always_pickup);
+                       do_cmd_stay(p_ptr, !always_pickup);
                        break;
                }