[Refactor] #38844 reset_concentrate を player_type 構造体へ移動．

diff --git a/src/core.c b/src/core.c
index 6d55f80..f90a425 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3523,7 +3523,7 @@ static void process_command(void)
 
        /* Sniper */
        if ((p_ptr->pclass == CLASS_SNIPER) && (p_ptr->concent))
-               reset_concent = TRUE;
+               p_ptr->reset_concent = TRUE;
 
        /* Parse the command */
        switch (command_cmd)
@@ -4896,7 +4896,7 @@ static void process_player(void)
                }
 
                /* Sniper */
-               if (p_ptr->energy_use && reset_concent) reset_concentration(TRUE);
+               if (p_ptr->energy_use && p_ptr->reset_concent) reset_concentration(TRUE);
 
                /* Handle "leaving" */
                if (p_ptr->leaving) break;

diff --git a/src/externs.h b/src/externs.h
index e879f25..79204e6 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -48,8 +48,6 @@ extern const byte adj_chr_chm[];
 extern bool repair_monsters;
 extern bool repair_objects;
 
-extern bool reset_concent;
-
 
 
 /*

diff --git a/src/player-status.h b/src/player-status.h
index cd94b74..3625d21 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -364,6 +364,8 @@ struct player_type
        bool now_damaged;
        bool ambush_flag;
 
+       bool reset_concent;   /* Concentration reset flag */
+
        bool wizard;              /* Player is in wizard mode */
 
        MONSTER_IDX riding;              /* Riding on a monster of this index */

diff --git a/src/snipe.c b/src/snipe.c
index d0b5866..73c7ac1 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -120,7 +120,7 @@ static bool snipe_concentrate(void)
        if ((int)p_ptr->concent < (2 + (p_ptr->lev + 5) / 10)) p_ptr->concent++;
 
        msg_format(_("集中した。(集中度 %d)", "You concentrate deeply. (lvl %d)"), p_ptr->concent);
-       reset_concent = FALSE;
+       p_ptr->reset_concent = FALSE;
 
        p_ptr->update |= (PU_BONUS | PU_MONSTERS);
        p_ptr->redraw |= (PR_STATUS);
@@ -140,7 +140,7 @@ void reset_concentration(bool msg)
        }
 
        p_ptr->concent = 0;
-       reset_concent = FALSE;
+       p_ptr->reset_concent = FALSE;
 
        p_ptr->update |= (PU_BONUS | PU_MONSTERS);
        p_ptr->redraw |= (PR_STATUS);

diff --git a/src/variable.c b/src/variable.c
index 7772eac..f22e18a 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -80,9 +80,3 @@ int server_port;
 
 /* for movie */
 bool browsing_movie;
-
-
-/* for snipers */
-bool reset_concent = FALSE;   /* Concentration reset flag */
-
-