From 870df5c7a9c0ef63e3f5752d1b34c057b1d8bd4b Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Mon, 11 Jan 2021 14:22:30 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#40514=20player=5Ftype=20=E3=81=AE?=
 =?utf8?q?=20sustain=5Fint=20=E5=A4=89=E6=95=B0=E3=82=92=E5=BB=83=E6=AD=A2?=
 =?utf8?q?.=20/=20Abolished=20sustain=5Fint=20variable=20in=20player=5Ftyp?=
 =?utf8?q?e.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/mutation/mutation-processor.c  | 2 +-
 src/player-info/base-status-info.c | 2 +-
 src/player/player-status.c         | 1 -
 src/player/player-status.h         | 1 -
 src/status/bad-status-setter.c     | 5 +++--
 src/status/base-status.c           | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 5c583a953..dbc04059f 100644
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -324,7 +324,7 @@ void process_world_aux_mutation(player_type *creature_ptr)
                 sustained = TRUE;
             break;
         case A_INT:
-            if (creature_ptr->sustain_int)
+            if (has_sustain_int(creature_ptr))
                 sustained = TRUE;
             break;
         case A_WIS:
diff --git a/src/player-info/base-status-info.c b/src/player-info/base-status-info.c
index de0502e5d..7e8710f22 100644
--- a/src/player-info/base-status-info.c
+++ b/src/player-info/base-status-info.c
@@ -61,7 +61,7 @@ void set_status_sustain_info(player_type *creature_ptr, self_info_type *self_ptr
     if (has_sustain_str(creature_ptr)) {
         self_ptr->info[self_ptr->line++] = _("あなたの腕力は維持されている。", "Your strength is sustained.");
     }
-    if (creature_ptr->sustain_int) {
+    if (has_sustain_int(creature_ptr)) {
         self_ptr->info[self_ptr->line++] = _("あなたの知能は維持されている。", "Your intelligence is sustained.");
     }
     if (creature_ptr->sustain_wis) {
diff --git a/src/player/player-status.c b/src/player/player-status.c
index 393d5ecc9..be7c2f8e9 100644
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -377,7 +377,6 @@ void calc_bonuses(player_type *creature_ptr)
     creature_ptr->hold_exp = has_hold_exp(creature_ptr);
     creature_ptr->see_inv = has_see_inv(creature_ptr);
     creature_ptr->free_act = has_free_act(creature_ptr);
-    creature_ptr->sustain_int = has_sustain_int(creature_ptr);
     creature_ptr->sustain_wis = has_sustain_wis(creature_ptr);
     creature_ptr->sustain_dex = has_sustain_dex(creature_ptr);
     creature_ptr->sustain_con = has_sustain_con(creature_ptr);
diff --git a/src/player/player-status.h b/src/player/player-status.h
index 3b6a19ce3..b04c6bc9f 100644
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -369,7 +369,6 @@ typedef struct player_type {
     BIT_FLAGS anti_magic; /* Anti-magic */
     BIT_FLAGS anti_tele; /* Prevent teleportation */
 
-    BIT_FLAGS sustain_int; /* Keep intelligence */
     BIT_FLAGS sustain_wis; /* Keep wisdom */
     BIT_FLAGS sustain_dex; /* Keep dexterity */
     BIT_FLAGS sustain_con; /* Keep constitution */
diff --git a/src/status/bad-status-setter.c b/src/status/bad-status-setter.c
index f94b08ada..4081e4e91 100644
--- a/src/status/bad-status-setter.c
+++ b/src/status/bad-status-setter.c
@@ -9,6 +9,7 @@
 #include "player/attack-defense-types.h"
 #include "player-info/avatar.h"
 #include "player/player-race.h"
+#include "player/player-status-flags.h"
 #include "player/special-defense-types.h"
 #include "spell-realm/spells-hex.h"
 #include "status/base-status.h"
@@ -419,12 +420,12 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v)
             msg_print(_("割れるような頭痛がする。", "A vicious blow hits your head."));
 
             if (one_in_(3)) {
-                if (!creature_ptr->sustain_int)
+                if (!has_sustain_int(creature_ptr))
                     (void)do_dec_stat(creature_ptr, A_INT);
                 if (!creature_ptr->sustain_wis)
                     (void)do_dec_stat(creature_ptr, A_WIS);
             } else if (one_in_(2)) {
-                if (!creature_ptr->sustain_int)
+                if (!has_sustain_int(creature_ptr))
                     (void)do_dec_stat(creature_ptr, A_INT);
             } else {
                 if (!creature_ptr->sustain_wis)
diff --git a/src/status/base-status.c b/src/status/base-status.c
index ae6f1fb1a..c91e33e31 100644
--- a/src/status/base-status.c
+++ b/src/status/base-status.c
@@ -183,7 +183,7 @@ bool do_dec_stat(player_type *creature_ptr, int stat)
             sust = TRUE;
         break;
     case A_INT:
-        if (creature_ptr->sustain_int)
+        if (has_sustain_int(creature_ptr))
             sust = TRUE;
         break;
     case A_WIS:
-- 
2.11.0