[Refactor] #40514 have_can_swim() を calc_bonuses() から分離． / Separated have_can_swim...

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index 4d65840..bdec794 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -1126,3 +1126,14 @@ void have_levitation(player_type *creature_ptr)
             creature_ptr->levitation = TRUE;
     }
 }
+
+void have_can_swim(player_type *creature_ptr)
+{
+       creature_ptr->can_swim = FALSE;
+    if (creature_ptr->riding) {
+        monster_type *riding_m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding];
+        monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx];
+        if (riding_r_ptr->flags7 & (RF7_CAN_SWIM | RF7_AQUATIC))
+            creature_ptr->can_swim = TRUE;
+    }
+}

diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index b0e45f4..ce19761 100644 (file)
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -43,5 +43,6 @@ void have_sustain_dex(player_type *creature_ptr);
 void have_sustain_con(player_type *creature_ptr);
 void have_sustain_chr(player_type *creature_ptr);
 void have_levitation(player_type *creature_ptr);
+void have_can_swim(player_type *creature_ptr);
 
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index f884901..2499163 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -569,7 +569,6 @@ static void clear_creature_bonuses(player_type *creature_ptr)
     creature_ptr->impact[1] = FALSE;
     creature_ptr->slow_digest = FALSE;
     creature_ptr->regenerate = FALSE;
-    creature_ptr->can_swim = FALSE;
     creature_ptr->resist_acid = FALSE;
     creature_ptr->resist_elec = FALSE;
     creature_ptr->resist_fire = FALSE;
@@ -640,7 +639,6 @@ void calc_bonuses(player_type *creature_ptr)
     object_type *o_ptr;
     BIT_FLAGS flgs[TR_FLAG_SIZE];
     bool omoi = FALSE;
-    floor_type *floor_ptr = creature_ptr->current_floor_ptr;
 
     /* Save the old vision stuff */
     bool old_telepathy = creature_ptr->telepathy;
@@ -737,6 +735,7 @@ void calc_bonuses(player_type *creature_ptr)
     have_sustain_con(creature_ptr);
     have_sustain_chr(creature_ptr);
     have_levitation(creature_ptr);
+    have_can_swim(creature_ptr);
 
     calc_race_status(creature_ptr);
 
@@ -814,13 +813,6 @@ void calc_bonuses(player_type *creature_ptr)
     calc_weapon_penalty(creature_ptr, INVEN_RARM);
     calc_weapon_penalty(creature_ptr, INVEN_LARM);
 
-    if (creature_ptr->riding) {
-        monster_type *riding_m_ptr = &floor_ptr->m_list[creature_ptr->riding];
-        monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx];
-        if (riding_r_ptr->flags7 & (RF7_CAN_SWIM | RF7_AQUATIC))
-            creature_ptr->can_swim = TRUE;
-    }
-
     creature_ptr->hold = adj_str_hold[creature_ptr->stat_ind[A_STR]];
     o_ptr = &creature_ptr->inventory_list[INVEN_BOW];
     creature_ptr->heavy_shoot = is_heavy_shoot(creature_ptr, o_ptr);