[Refactor] #40014 Renamed monster-process.c/h to monster-processor.c/h and monster...

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0243fde..5445390 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -431,7 +431,7 @@
     <ClCompile Include="..\..\src\store\store-owners.c" />\r
     <ClCompile Include="..\..\src\store\store-util.c" />\r
     <ClCompile Include="..\..\src\monster\monster-dist-offsets.c" />\r
-    <ClCompile Include="..\..\src\monster\monster-process.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-processor.c" />\r
     <ClCompile Include="..\..\src\monster\monster-status.c" />\r
     <ClCompile Include="..\..\src\monster-race\monster-race-hook.c" />\r
     <ClCompile Include="..\..\src\monster-race\monster-race.c" />\r
@@ -443,7 +443,7 @@
     <ClCompile Include="..\..\src\monster\monster-safety-hiding.c" />\r
     <ClCompile Include="..\..\src\monster\monster-sweep-grid.c" />\r
     <ClCompile Include="..\..\src\monster\monster-update.c" />\r
-    <ClCompile Include="..\..\src\monster\monster-util.c" />\r
+    <ClCompile Include="..\..\src\monster\monster-processor-util.c" />\r
     <ClCompile Include="..\..\src\monster\quantum-effect.c" />\r
     <ClCompile Include="..\..\src\mutation\mutation-processor.c" />\r
     <ClCompile Include="..\..\src\object-enchant\object-boost.c" />\r
@@ -915,7 +915,7 @@
     <ClInclude Include="..\..\src\monster\monster-safety-hiding.h" />\r
     <ClInclude Include="..\..\src\monster\monster-sweep-grid.h" />\r
     <ClInclude Include="..\..\src\monster\monster-update.h" />\r
-    <ClInclude Include="..\..\src\monster\monster-util.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-processor-util.h" />\r
     <ClInclude Include="..\..\src\monster\quantum-effect.h" />\r
     <ClInclude Include="..\..\src\mutation\mutation-processor.h" />\r
     <ClInclude Include="..\..\src\object\object-flavor.h" />\r
@@ -980,7 +980,7 @@
     <ClInclude Include="..\..\src\main\init.h" />\r
     <ClInclude Include="..\..\src\io\load.h" />\r
     <ClInclude Include="..\..\src\mind\mind.h" />\r
-    <ClInclude Include="..\..\src\monster\monster-process.h" />\r
+    <ClInclude Include="..\..\src\monster\monster-processor.h" />\r
     <ClInclude Include="..\..\src\mspell\monster-spell.h" />\r
     <ClInclude Include="..\..\src\monster\monster-status.h" />\r
     <ClInclude Include="..\..\src\system\monster-type-definition.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 4302936..8d8f678 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -62,9 +62,6 @@
     <ClCompile Include="..\..\src\monster\quantum-effect.c">
       <Filter>monster</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monster\monster-util.c">
-      <Filter>monster</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monster\monster-object.c">
       <Filter>monster</Filter>
     </ClCompile>
@@ -509,9 +506,6 @@
     <ClCompile Include="..\..\src\monster\monster-dist-offsets.c">
       <Filter>monster</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\monster\monster-process.c">
-      <Filter>monster</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monster\monster-status.c">
       <Filter>monster</Filter>
     </ClCompile>
@@ -1247,6 +1241,12 @@
     <ClCompile Include="..\..\src\player\eldritch-horror.c">
       <Filter>player</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-processor-util.c">
+      <Filter>monster</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\monster\monster-processor.c">
+      <Filter>monster</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -1309,9 +1309,6 @@
     <ClInclude Include="..\..\src\monster\quantum-effect.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster\monster-util.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster\monster-object.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -1786,9 +1783,6 @@
     <ClInclude Include="..\..\src\monster\monster-dist-offsets.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\monster\monster-process.h">
-      <Filter>monster</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster\monster-status.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -2716,6 +2710,12 @@
     <ClInclude Include="..\..\src\system\monster-type-definition.h">
       <Filter>system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-processor-util.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\monster\monster-processor.h">
+      <Filter>monster</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b06740..3bac177 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -287,7 +287,8 @@ hengband_SOURCES = \
        monster/monster-flag-types.h \
        monster/monster-move.c monster/monster-move.h \
        monster/monster-object.c monster/monster-object.h \
-       monster/monster-process.c monster/monster-process.h \
+       monster/monster-processor.c monster/monster-processor.h \
+       monster/monster-processor-util.c monster/monster-processor-util.h \
        monster/monster-runaway.c monster/monster-runaway.h \
        monster/monster-safety-hiding.c monster/monster-safety-hiding.h \
        monster/monster-timed-effect-types.h \
@@ -296,7 +297,6 @@ hengband_SOURCES = \
        monster/monster-status.c monster/monster-status.h \
        monster/monster-sweep-grid.c monster/monster-sweep-grid.h \
        monster/monster-update.c monster/monster-update.h \
-       monster/monster-util.c monster/monster-util.h \
        monster/quantum-effect.c monster/quantum-effect.h \
        \
        monster-attack/insults-moans.c monster-attack/insults-moans.h \

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index 92a635f..89a8753 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -17,7 +17,7 @@
 #include "grid/grid.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
-#include "monster/monster-process.h"
+#include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index b642f91..b15b87a 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -9,7 +9,7 @@
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "market/arena.h"
-#include "monster/monster-process.h"
+#include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "player/player-effects.h"

diff --git a/src/monster/monster-attack.h b/src/monster/monster-attack.h
index b4ef3ce..5ffff4d 100644 (file)
--- a/src/monster/monster-attack.h
+++ b/src/monster/monster-attack.h
@@ -2,7 +2,7 @@
 
 #include "system/angband.h"
 #include "grid/grid.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx);
 bool process_monster_attack_to_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, grid_type *g_ptr, bool can_cross);

diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index 4c34f7f..8b6e9f6 100644 (file)
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -7,7 +7,7 @@
 #include "monster/monster-direction.h"
 #include "floor/floor.h"
 #include "monster/monster-sweep-grid.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/monster/monster-move.h b/src/monster/monster-move.h
index 78cdfc2..d7bd03d 100644 (file)
--- a/src/monster/monster-move.h
+++ b/src/monster/monster-move.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, DIRECTION *mm, POSITION oy, POSITION ox, int *count);
 void process_speak_sound(player_type *target_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, bool aware);

diff --git a/src/monster/monster-object.h b/src/monster/monster-object.h
index c94288a..2314bfc 100644 (file)
--- a/src/monster/monster-object.h
+++ b/src/monster/monster-object.h
@@ -7,6 +7,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 void update_object_by_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx);

diff --git a/src/monster/monster-util.c b/src/monster/monster-processor-util.c
similarity index 99%
rename from src/monster/monster-util.c
rename to src/monster/monster-processor-util.c
index 5e6718c..3408dda 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-processor-util.c
@@ -7,7 +7,7 @@
  * 引数に入っていたらここには移動させないこと
  */
 
-#include "monster-util.h"
+#include "monster/monster-processor-util.h"
 #include "monster/monster-status.h"
 
  /*!

diff --git a/src/monster/monster-util.h b/src/monster/monster-processor-util.h
similarity index 100%
rename from src/monster/monster-util.h
rename to src/monster/monster-processor-util.h

diff --git a/src/monster/monster-process.c b/src/monster/monster-processor.c
similarity index 99%
rename from src/monster/monster-process.c
rename to src/monster/monster-processor.c
index 99b9dbc..9028360 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-processor.c
@@ -13,7 +13,7 @@
  * to improve the general quality of the AI (version 0.1.1).
  */
 
-#include "monster/monster-process.h"
+#include "monster/monster-processor.h"
 #include "cmd-io/cmd-dump.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
@@ -28,7 +28,7 @@
 #include "monster/monster-runaway.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/quantum-effect.h"

diff --git a/src/monster/monster-process.h b/src/monster/monster-processor.h
similarity index 100%
rename from src/monster/monster-process.h
rename to src/monster/monster-processor.h

diff --git a/src/monster/monster-runaway.h b/src/monster/monster-runaway.h
index d0adfe3..cb873b4 100644 (file)
--- a/src/monster/monster-runaway.h
+++ b/src/monster/monster-runaway.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx);

diff --git a/src/monster/monster-safety-hiding.h b/src/monster/monster-safety-hiding.h
index 6b0af99..beffe09 100644 (file)
--- a/src/monster/monster-safety-hiding.h
+++ b/src/monster/monster-safety-hiding.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 bool find_safety(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp);
 bool find_hiding(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp);

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index dda1204..735d66a 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -18,7 +18,7 @@
 #include "monster/creature.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster-process.h"
+#include "monster/monster-processor.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/monster/monster-sweep-grid.h b/src/monster/monster-sweep-grid.h
index e8d059f..6cdd355 100644 (file)
--- a/src/monster/monster-sweep-grid.h
+++ b/src/monster/monster-sweep-grid.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm);
\ No newline at end of file

diff --git a/src/monster/monster-update.h b/src/monster/monster-update.h
index 42d61c3..58b0e7d 100644 (file)
--- a/src/monster/monster-update.h
+++ b/src/monster/monster-update.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster/monster-util.h"
+#include "monster/monster-processor-util.h"
 
 bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, POSITION ny, POSITION nx);
 void update_player_type(player_type *target_ptr, turn_flags *turn_flags_ptr, monster_race *r_ptr);

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index e327f2f..24fbd52 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -37,7 +37,7 @@
 #include "mind/mind-force-trainer.h"
 #include "monster/creature.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster-process.h"
+#include "monster/monster-processor.h"
 #include "monster/monster-status.h"
 #include "monster/monster2.h"
 #include "monster/place-monster-types.h"