[Refactor] #40414 Separated racial-cavalry.c/h from spells2.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index bac3c66..99bc63a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -205,6 +205,7 @@
     <ClCompile Include="..\..\src\market\building-quest.c" />\r
     <ClCompile Include="..\..\src\market\building-recharger.c" />\r
     <ClCompile Include="..\..\src\market\building-service.c" />\r
+    <ClCompile Include="..\..\src\mind\racial-cavalry.c" />\r
     <ClCompile Include="..\..\src\mind\racial-force-trainer.c" />\r
     <ClCompile Include="..\..\src\mind\racial-mirror-master.c" />\r
     <ClCompile Include="..\..\src\mind\monk-attack.c" />\r
@@ -500,6 +501,7 @@
     <ClInclude Include="..\..\src\market\building-quest.h" />\r
     <ClInclude Include="..\..\src\market\building-recharger.h" />\r
     <ClInclude Include="..\..\src\market\building-service.h" />\r
+    <ClInclude Include="..\..\src\mind\racial-cavalry.h" />\r
     <ClInclude Include="..\..\src\mind\racial-force-trainer.h" />\r
     <ClInclude Include="..\..\src\mind\racial-mirror-master.h" />\r
     <ClInclude Include="..\..\src\mind\monk-attack.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index b44eec5..67cdf35 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1121,6 +1121,9 @@
     <ClCompile Include="..\..\src\spell\spells-hex.c">
       <Filter>spell</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\mind\racial-cavalry.c">
+      <Filter>mind</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2398,6 +2401,9 @@
     <ClInclude Include="..\..\src\realm\realm-song-numbers.h">
       <Filter>realm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\mind\racial-cavalry.h">
+      <Filter>mind</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 12091af..3c85d3d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -245,6 +245,7 @@ hengband_SOURCES = \
        \
        mind/mind.c mind/mind.h \
        mind/racial.c mind/racial.h \
+       mind/racial-cavalry.c mind/racial-cavalry.h \
        mind/racial-samurai.c mind/racial-samurai.h \
        mind/racial-mirror-master.c mind/racial-mirror-master.h \
        mind/racial-force-trainer.c mind/racial-force-trainer.h \

diff --git a/src/mind/racial-cavalry.c b/src/mind/racial-cavalry.c
new file mode 100644 (file)
index 0000000..a8933a8
--- /dev/null
+++ b/src/mind/racial-cavalry.c
@@ -0,0 +1,61 @@
+/*!
+ * @brief 騎兵のレイシャルパワー処理
+ * @date 2020/05/16
+ * @author Hourier
+ */
+
+#include "mind/racial-cavalry.h"
+#include "cmd-action/cmd-pet.h"
+#include "floor/floor.h"
+#include "pet/pet-fall-off.h"
+#include "player/player-skill.h"
+
+/*!
+ * 荒馬慣らし
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return 結果はどうあれ騎乗したらTRUE
+ */
+bool rodeo(player_type *creature_ptr)
+{
+    GAME_TEXT m_name[MAX_NLEN];
+    monster_type *m_ptr;
+    monster_race *r_ptr;
+    int rlev;
+
+    if (creature_ptr->riding) {
+        msg_print(_("今は乗馬中だ。", "You ARE riding."));
+        return FALSE;
+    }
+
+    if (!do_cmd_riding(creature_ptr, TRUE))
+        return TRUE;
+
+    m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding];
+    r_ptr = &r_info[m_ptr->r_idx];
+    monster_desc(creature_ptr, m_name, m_ptr, 0);
+    msg_format(_("%sに乗った。", "You ride on %s."), m_name);
+
+    if (is_pet(m_ptr))
+        return TRUE;
+
+    rlev = r_ptr->level;
+
+    if (r_ptr->flags1 & RF1_UNIQUE)
+        rlev = rlev * 3 / 2;
+    if (rlev > 60)
+        rlev = 60 + (rlev - 60) / 2;
+    if ((randint1(creature_ptr->skill_exp[GINOU_RIDING] / 120 + creature_ptr->lev * 2 / 3) > rlev) && one_in_(2)
+        && !creature_ptr->current_floor_ptr->inside_arena && !creature_ptr->phase_out && !(r_ptr->flags7 & (RF7_GUARDIAN)) && !(r_ptr->flags1 & (RF1_QUESTOR))
+        && (rlev < creature_ptr->lev * 3 / 2 + randint0(creature_ptr->lev / 5))) {
+        msg_format(_("%sを手なずけた。", "You tame %s."), m_name);
+        set_pet(creature_ptr, m_ptr);
+    } else {
+        msg_format(_("%sに振り落とされた！", "You have been thrown off by %s."), m_name);
+        process_fall_off_horse(creature_ptr, 1, TRUE);
+
+        /* 落馬処理に失敗してもとにかく乗馬解除 */
+        creature_ptr->riding = 0;
+    }
+
+    return TRUE;
+}

diff --git a/src/mind/racial-cavalry.h b/src/mind/racial-cavalry.h
new file mode 100644 (file)
index 0000000..901020e
--- /dev/null
+++ b/src/mind/racial-cavalry.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+bool rodeo(player_type *creature_ptr);

diff --git a/src/mind/racial.c b/src/mind/racial.c
index eedccef..94b2ba3 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -20,6 +20,7 @@
 #include "core/stuff-handler.h"
 #include "effect/spells-effect-util.h"
 #include "io/targeting.h"
+#include "mind/racial-cavalry.h"
 #include "mind/racial-samurai.h"
 #include "mutation/mutation.h"
 #include "object/object-hook.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index db951b9..9cff131 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -3751,58 +3751,6 @@ bool confusing_light(player_type *creature_ptr)
 }
 
 
-/*!
- * 荒馬慣らし
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return 結果はどうあれ騎乗したらTRUE
-*/
-bool rodeo(player_type *creature_ptr)
-{
-       GAME_TEXT m_name[MAX_NLEN];
-       monster_type *m_ptr;
-       monster_race *r_ptr;
-       int rlev;
-
-       if (creature_ptr->riding)
-       {
-               msg_print(_("今は乗馬中だ。", "You ARE riding."));
-               return FALSE;
-       }
-
-       if (!do_cmd_riding(creature_ptr, TRUE)) return TRUE;
-
-       m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding];
-       r_ptr = &r_info[m_ptr->r_idx];
-       monster_desc(creature_ptr, m_name, m_ptr, 0);
-       msg_format(_("%sに乗った。", "You ride on %s."), m_name);
-
-       if (is_pet(m_ptr)) return TRUE;
-
-       rlev = r_ptr->level;
-
-       if (r_ptr->flags1 & RF1_UNIQUE) rlev = rlev * 3 / 2;
-       if (rlev > 60) rlev = 60 + (rlev - 60) / 2;
-       if ((randint1(creature_ptr->skill_exp[GINOU_RIDING] / 120 + creature_ptr->lev * 2 / 3) > rlev)
-               && one_in_(2) && !creature_ptr->current_floor_ptr->inside_arena && !creature_ptr->phase_out
-               && !(r_ptr->flags7 & (RF7_GUARDIAN)) && !(r_ptr->flags1 & (RF1_QUESTOR))
-               && (rlev < creature_ptr->lev * 3 / 2 + randint0(creature_ptr->lev / 5)))
-       {
-               msg_format(_("%sを手なずけた。", "You tame %s."), m_name);
-               set_pet(creature_ptr, m_ptr);
-       }
-       else
-       {
-               msg_format(_("%sに振り落とされた！", "You have been thrown off by %s."), m_name);
-               process_fall_off_horse(creature_ptr, 1, TRUE);
-
-               /* 落馬処理に失敗してもとにかく乗馬解除 */
-               creature_ptr->riding = 0;
-       }
-
-       return TRUE;
-}
-
-
 bool clear_mind(player_type *creature_ptr)
 {
        if (total_friends)

diff --git a/src/spell/spells2.h b/src/spell/spells2.h
index 4c76bcd..9a085a2 100644 (file)
--- a/src/spell/spells2.h
+++ b/src/spell/spells2.h
@@ -100,6 +100,5 @@ bool demonic_breath(player_type* creature_ptr);
 bool mirror_concentration(player_type* creature_ptr);
 bool sword_dancing(player_type* creature_ptr);
 bool confusing_light(player_type* creature_ptr);
-bool rodeo(player_type* creature_ptr);
 bool clear_mind(player_type* creature_ptr);
 bool vanish_dungeon(player_type* caster_ptr);