[Refactor] #40457 Moved vorpal-weapon.c/h from combat/ to object-enchant/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 7a91e7d..8d3c530 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -189,7 +189,7 @@
     <ClCompile Include="..\..\src\player-attack\player-attack.c" />\r
     <ClCompile Include="..\..\src\combat\slaying.c" />\r
     <ClCompile Include="..\..\src\player-attack\blood-sucking-processor.c" />\r
-    <ClCompile Include="..\..\src\combat\vorpal-weapon.c" />\r
+    <ClCompile Include="..\..\src\object-enchant\vorpal-weapon.c" />\r
     <ClCompile Include="..\..\src\floor\floor-object.c" />\r
     <ClCompile Include="..\..\src\inventory\inventory-damage.c" />\r
     <ClCompile Include="..\..\src\inventory\inventory-object.c" />\r
@@ -504,7 +504,7 @@
     <ClInclude Include="..\..\src\player-attack\player-attack-util.h" />\r
     <ClInclude Include="..\..\src\player-attack\player-attack.h" />\r
     <ClInclude Include="..\..\src\combat\slaying.h" />\r
-    <ClInclude Include="..\..\src\combat\vorpal-weapon.h" />\r
+    <ClInclude Include="..\..\src\object-enchant\vorpal-weapon.h" />\r
     <ClInclude Include="..\..\src\floor\floor-object.h" />\r
     <ClInclude Include="..\..\src\inventory\inventory-damage.h" />\r
     <ClInclude Include="..\..\src\inventory\inventory-object.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 544d153..8df4586 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -830,9 +830,6 @@
     <ClCompile Include="..\..\src\mind\monk-attack.c">
       <Filter>mind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\combat\vorpal-weapon.c">
-      <Filter>combat</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monster\monster-race-hook.c">
       <Filter>monster</Filter>
     </ClCompile>
@@ -1184,6 +1181,9 @@
     <ClCompile Include="..\..\src\melee\monster-attack-monster.c">
       <Filter>melee</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object-enchant\vorpal-weapon.c">
+      <Filter>object-enchant</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2083,9 +2083,6 @@
     <ClInclude Include="..\..\src\mind\monk-attack.h">
       <Filter>mind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\combat\vorpal-weapon.h">
-      <Filter>combat</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster\monster-race-hook.h">
       <Filter>monster</Filter>
     </ClInclude>
@@ -2524,6 +2521,9 @@
     <ClInclude Include="..\..\src\melee\monster-attack-monster.h">
       <Filter>melee</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object-enchant\vorpal-weapon.h">
+      <Filter>object-enchant</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/combat/vorpal-weapon.c b/src/object-enchant/vorpal-weapon.c
similarity index 98%
rename from src/combat/vorpal-weapon.c
rename to src/object-enchant/vorpal-weapon.c
index 16c90d4..79defa3 100644 (file)
--- a/src/combat/vorpal-weapon.c
+++ b/src/object-enchant/vorpal-weapon.c
@@ -1,4 +1,4 @@
-#include "combat/vorpal-weapon.h"
+#include "object-enchant/vorpal-weapon.h"
 #include "io/files-util.h"
 #include "object-enchant/artifact.h"
 

diff --git a/src/combat/vorpal-weapon.h b/src/object-enchant/vorpal-weapon.h
similarity index 100%
rename from src/combat/vorpal-weapon.h
rename to src/object-enchant/vorpal-weapon.h

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index 8f14534..8f10aba 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -12,7 +12,7 @@
 #include "combat/martial-arts-table.h"
 #include "player-attack/player-attack-util.h"
 #include "combat/slaying.h"
-#include "combat/vorpal-weapon.h"
+#include "object-enchant/vorpal-weapon.h"
 #include "floor/floor.h"
 #include "main/sound-definitions-table.h"
 #include "mind/mind-ninja.h"