From 5a2df3dbc6477b69d11c6c2dbf3498038617943b Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 5 Jul 2020 16:39:12 +0900
Subject: [PATCH] [Refactor] #40467 Separated rd_action() from rd_extra()

---
 src/savedata/extra-loader.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/savedata/extra-loader.c b/src/savedata/extra-loader.c
index 5f1371b5c..10f4425a3 100644
--- a/src/savedata/extra-loader.c
+++ b/src/savedata/extra-loader.c
@@ -409,6 +409,17 @@ static void rd_special_attack(player_type *creature_ptr)
     rd_u32b(&creature_ptr->special_attack);
 }
 
+static void rd_action(player_type *creature_ptr)
+{
+    if (creature_ptr->special_attack & KAMAE_MASK) {
+        creature_ptr->action = ACTION_KAMAE;
+        return;
+    }
+    
+    if (creature_ptr->special_attack & KATA_MASK)
+        creature_ptr->action = ACTION_KATA;
+}
+
 /*!
  * @brief その他の情報を読み込む / Read the "extra" information
  * @param creature_ptr プレーヤーへの参照ポインタ
@@ -454,11 +465,7 @@ void rd_extra(player_type *creature_ptr)
     rd_timed_effects(creature_ptr);
     creature_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod(creature_ptr);
     rd_special_attack(creature_ptr);
-    if (creature_ptr->special_attack & KAMAE_MASK)
-        creature_ptr->action = ACTION_KAMAE;
-    else if (creature_ptr->special_attack & KATA_MASK)
-        creature_ptr->action = ACTION_KATA;
-
+    rd_action(creature_ptr);
     if (z_older_than(10, 0, 12))
         set_zangband_special_defense(creature_ptr);
     else {
-- 
2.11.0