From: Hourier <hourier@users.sourceforge.jp>
Date: Wed, 22 Jul 2020 13:40:05 +0000 (+0900)
Subject: [Refactor] #40480 Separated check_riding() from check_melee_spell_set()
X-Git-Tag: vmacos3.0.0-alpha52~782^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=079525f7fa51e263dbf7ac4172c8e89214184c51;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #40480 Separated check_riding() from check_melee_spell_set()
---

diff --git a/src/melee/melee-spell.c b/src/melee/melee-spell.c
index 5871834ec..a3f585e87 100644
--- a/src/melee/melee-spell.c
+++ b/src/melee/melee-spell.c
@@ -251,6 +251,16 @@ static void check_melee_spell_special(player_type *target_ptr, melee_spell_type
     ms_ptr->f6 &= ~(RF6_SPECIAL);
 }
 
+static void check_riding(player_type *target_ptr, melee_spell_type *ms_ptr)
+{
+    if (ms_ptr->m_idx != target_ptr->riding)
+        return;
+
+    ms_ptr->f4 &= ~(RF4_RIDING_MASK);
+    ms_ptr->f5 &= ~(RF5_RIDING_MASK);
+    ms_ptr->f6 &= ~(RF6_RIDING_MASK);
+}
+
 static void check_pet(player_type *target_ptr, melee_spell_type *ms_ptr)
 {
     if (!ms_ptr->pet)
@@ -376,12 +386,7 @@ static bool check_melee_spell_set(player_type *target_ptr, melee_spell_type *ms_
     if (target_ptr->phase_out && !one_in_(3))
         ms_ptr->f6 &= ~(RF6_HEAL);
 
-    if (ms_ptr->m_idx == target_ptr->riding) {
-        ms_ptr->f4 &= ~(RF4_RIDING_MASK);
-        ms_ptr->f5 &= ~(RF5_RIDING_MASK);
-        ms_ptr->f6 &= ~(RF6_RIDING_MASK);
-    }
-
+    check_riding(target_ptr, ms_ptr);
     check_pet(target_ptr, ms_ptr);
     check_non_stupid(target_ptr, ms_ptr);
     check_smart(target_ptr, ms_ptr);