[Refactor] #40416 Renamed melee.c/h to melee-postprocess.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0a5ba3b..195522d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -317,7 +317,7 @@
     <ClCompile Include="..\..\src\cmd\lighting-level-table.c" />\r
     <ClCompile Include="..\..\src\cmd\monster-group-table.c" />\r
     <ClCompile Include="..\..\src\cmd\object-group-table.c" />\r
-    <ClCompile Include="..\..\src\combat\melee.c" />\r
+    <ClCompile Include="..\..\src\combat\melee-postprocess.c" />\r
     <ClCompile Include="..\..\src\combat\shoot.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-bolt.c" />\r
     <ClCompile Include="..\..\src\mspell\mspell-breath.c" />\r
@@ -691,7 +691,7 @@
     <ClInclude Include="..\..\src\cmd\lighting-level-table.h" />\r
     <ClInclude Include="..\..\src\cmd\monster-group-table.h" />\r
     <ClInclude Include="..\..\src\cmd\object-group-table.h" />\r
-    <ClInclude Include="..\..\src\combat\melee.h" />\r
+    <ClInclude Include="..\..\src\combat\melee-postprocess.h" />\r
     <ClInclude Include="..\..\src\combat\shoot.h" />\r
     <ClInclude Include="..\..\src\core\show-file.h" />\r
     <ClInclude Include="..\..\src\view\display-birth.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index d4986f4..b652ad3 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -263,9 +263,6 @@
     <ClCompile Include="..\..\src\knowledge\knowledge-mutations.c">
       <Filter>knowledge</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\combat\melee.c">
-      <Filter>combat</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\autopick\autopick.c">
       <Filter>autopick</Filter>
     </ClCompile>
@@ -1034,6 +1031,9 @@
     <ClCompile Include="..\..\src\combat\monster-attack-monster.c">
       <Filter>combat</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\combat\melee-postprocess.c">
+      <Filter>combat</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -1087,9 +1087,6 @@
     <ClInclude Include="..\..\src\cmd\cmd-zapwand.h">
       <Filter>cmd</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\combat\melee.h">
-      <Filter>combat</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\combat\shoot.h">
       <Filter>combat</Filter>
     </ClInclude>
@@ -2140,6 +2137,9 @@
     <ClInclude Include="..\..\src\combat\monster-attack-monster.h">
       <Filter>combat</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\combat\melee-postprocess.h">
+      <Filter>combat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index e0a764a..8503446 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -340,7 +340,6 @@ hengband_SOURCES = \
        cmd/cmd-attack.c cmd/cmd-attack.h \
        \
        combat/player-attack-util.h \
-       combat/melee.h combat/melee.c \
        combat/attack-power-table.c combat/attack-power-table.h \
        combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
        combat/monster-attack-types.c combat/monster-attack-types.h \
@@ -358,6 +357,7 @@ hengband_SOURCES = \
        combat/attack-chaos-effect.c combat/attack-chaos-effect.h \
        combat/monster-attack-player.c combat/monster-attack-player.h \
        combat/monster-attack-monster.c combat/monster-attack-monster.h \
+       combat/melee-postprocess.c combat/melee-postprocess.h \
        combat/shoot.c combat/shoot.h \
        combat/snipe.c combat/snipe.h \
        \

diff --git a/src/combat/melee.c b/src/combat/melee-postprocess.c
similarity index 98%
rename from src/combat/melee.c
rename to src/combat/melee-postprocess.c
index 21199b9..8f7b811 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee-postprocess.c
@@ -1,6 +1,5 @@
 /*!
- * @file melee1.c
- * @brief 打撃処理 / Melee process.
+ * @brief モンスター同士の打撃後処理 / Melee post-process.
  * @date 2014/01/17
  * @author
  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke\n
@@ -16,7 +15,7 @@
 #include "main/sound-definitions-table.h"
 #include "cmd-pet.h"
 #include "monster/monsterrace-hook.h"
-#include "melee.h"
+#include "combat/melee-postprocess.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "mspell/monster-spell.h"
@@ -27,7 +26,6 @@
 #include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 #include "combat/monster-attack-types.h"
-#include "mind/samurai-slaying.h"
 
 /*!
  * todo 打撃が当たった時の後処理 (爆発持ちのモンスターを爆発させる等)なので、関数名を変更する必要あり

diff --git a/src/combat/melee.h b/src/combat/melee-postprocess.h
similarity index 100%
rename from src/combat/melee.h
rename to src/combat/melee-postprocess.h

diff --git a/src/combat/monster-attack-monster.c b/src/combat/monster-attack-monster.c
index aa16714..9fbcd4b 100644 (file)
--- a/src/combat/monster-attack-monster.c
+++ b/src/combat/monster-attack-monster.c
@@ -13,7 +13,7 @@
 #include "spell/process-effect.h"
 #include "monster/monsterrace-hook.h"
 #include "realm/realm-hex.h"
-#include "combat/melee.h"
+#include "combat/melee-postprocess.h"
 
 #define BLOW_EFFECT_TYPE_NONE 0
 #define BLOW_EFFECT_TYPE_FEAR 1

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 4008692..246318e 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -19,7 +19,7 @@
 #include "cmd-magiceat.h"
 #include "cmd-mane.h"
 #include "cmd-zapwand.h"
-#include "melee.h"
+#include "combat/melee-postprocess.h"
 #include "object/object-hook.h"
 
 #include "mutation/mutation.h"

diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 45935fb..e1eedf9 100644 (file)
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -26,7 +26,7 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-pet.h"
 #include "monster/creature.h"
-#include "melee.h"
+#include "combat/melee-postprocess.h"
 #include "spell/spells-summon.h"
 #include "player/avatar.h"
 #include "realm/realm-hex.h"

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index dc74bd1..ef26daa 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -33,7 +33,7 @@
 #include "floor/wild.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"
-#include "melee.h"
+#include "combat/melee-postprocess.h"
 #include "locale/japanese.h"
 #include "view/display-main-window.h"
 #include "player/player-class.h"

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index bbdaeb9..c29a166 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -16,7 +16,7 @@
 #include "spell/spells3.h"
 #include "spell/process-effect.h"
 #include "player/player-effects.h"
-#include "combat/melee.h"
+#include "combat/melee-postprocess.h"
 
 /*!
  * @brief バーノール・ルパートのRF6_SPECIALの処理。分裂・合体。 /