[Refactor] #40416 Moved pet-fall-off.c/h from monster/ to pet/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index f76c457..f42ebfc 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -209,7 +209,7 @@
     <ClCompile Include="..\..\src\mind\racial-samurai.c" />\r
     <ClCompile Include="..\..\src\mind\samurai-slaying.c" />\r
     <ClCompile Include="..\..\src\mind\surprise-attack.c" />\r
-    <ClCompile Include="..\..\src\monster\pet-fall-off.c" />\r
+    <ClCompile Include="..\..\src\pet\pet-fall-off.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-floor.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-particularity.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-special.c" />\r
@@ -487,7 +487,7 @@
     <ClInclude Include="..\..\src\mind\racial-samurai.h" />\r
     <ClInclude Include="..\..\src\mind\samurai-slaying.h" />\r
     <ClInclude Include="..\..\src\mind\surprise-attack.h" />\r
-    <ClInclude Include="..\..\src\monster\pet-fall-off.h" />\r
+    <ClInclude Include="..\..\src\pet\pet-fall-off.h" />\r
     <ClInclude Include="..\..\src\pet\pet-util.h" />\r
     <ClInclude Include="..\..\src\mspell\assign-monster-spell.h" />\r
     <ClInclude Include="..\..\src\mspell\mspell-floor.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 158e7cd..90964a6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1061,8 +1061,8 @@
     <ClCompile Include="..\..\src\combat\aura-counterattack.c">
       <Filter>combat</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monster\pet-fall-off.c">
-      <Filter>monster</Filter>
+    <ClCompile Include="..\..\src\pet\pet-fall-off.c">
+      <Filter>pet</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -2275,12 +2275,12 @@
     <ClInclude Include="..\..\src\combat\aura-counterattack.h">
       <Filter>combat</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster\pet-fall-off.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\pet\pet-util.h">
       <Filter>pet</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\pet\pet-fall-off.h">
+      <Filter>pet</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ee32b8e..5ce35c3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,8 +186,8 @@ hengband_SOURCES = \
        monster/monster-status.c monster/monster-status.h \
        monster/monster1.c monster/monster2.c \
        monster/horror-descriptions.c monster/horror-descriptions.h \
-       monster/pet-fall-off.c monster/pet-fall-off.h \
        \
+       pet/pet-fall-off.c pet/pet-fall-off.h \
        pet/pet-util.h \
        \
        mutation/mutation.c mutation/mutation.h \

diff --git a/src/combat/melee-postprocess.c b/src/combat/melee-postprocess.c
index c0af6a8..3ab8749 100644 (file)
--- a/src/combat/melee-postprocess.c
+++ b/src/combat/melee-postprocess.c
@@ -17,7 +17,7 @@
 #include "monster/monster-race-hook.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "mspell/monster-spell.h"
 #include "player/player-class.h"
 #include "player/player-move.h"

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index db7198c..2310334 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -21,7 +21,7 @@
 #include "main/sound-definitions-table.h"
 #include "mind/racial-samurai.h"
 #include "monster/monster-status.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "object/object-hook.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index d5878a5..7eba63e 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -4,7 +4,7 @@
 #include "floor/floor.h"
 #include "monster/monster-race-hook.h"
 #include "monster/monster-status.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "object/trc-types.h"
 #include "player/player-effects.h"
 #include "spell/spells-diceroll.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 8f0b163..2329f7e 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -24,7 +24,7 @@
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "monster/creature.h"
 #include "combat/melee-postprocess.h"
 #include "spell/spells-summon.h"

diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index 9b68889..6ca9f88 100644 (file)
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -6,7 +6,7 @@
 
 #include "monster/monster-runaway.h"
 #include "dungeon/quest.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "player/player-move.h"
 
  /*!

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 8da4a4b..27d3983 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -18,7 +18,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-building.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-kind-hook.h"
 #include "player/player-personalities-table.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 5e39128..c042e66 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -17,7 +17,7 @@
 
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "object/object2.h"

diff --git a/src/monster/pet-fall-off.c b/src/pet/pet-fall-off.c
similarity index 99%
rename from src/monster/pet-fall-off.c
rename to src/pet/pet-fall-off.c
index ab163fb..37e32a9 100644 (file)
--- a/src/monster/pet-fall-off.c
+++ b/src/pet/pet-fall-off.c
@@ -1,4 +1,4 @@
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "cmd/cmd-pet.h" // 暫定、player_can_ride_aux() を移動する
 #include "core/stuff-handler.h"
 #include "floor/floor.h"

diff --git a/src/monster/pet-fall-off.h b/src/pet/pet-fall-off.h
similarity index 100%
rename from src/monster/pet-fall-off.h
rename to src/pet/pet-fall-off.h

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index 90c9234..2820a67 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -2,7 +2,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/process-effect.h"
 #include "floor/floor.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-feature.h"
 #include "effect/effect-item.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 149b287..1de5b9f 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -23,7 +23,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-pet.h"
 #include "pet/pet-util.h"
-#include "monster/pet-fall-off.h"
+#include "pet/pet-fall-off.h"
 #include "cmd/cmd-dump.h"
 #include "effect/effect-characteristics.h"
 #include "grid/grid.h"