[Refactor] #37353 Renamed melee1.c to melee.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 7048ae3..ec67307 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -201,7 +201,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\melee1.c" />\r
+    <ClCompile Include="..\..\src\combat\melee.c" />\r
     <ClCompile Include="..\..\src\combat\shoot.c" />\r
     <ClCompile Include="..\..\src\core.c" />\r
     <ClCompile Include="..\..\src\core\show-file.c" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index ad23d81..b4b2faa 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -382,9 +382,6 @@
     <ClCompile Include="..\..\src\cmd\cmd-zapwand.c">
       <Filter>cmd</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\combat\melee1.c">
-      <Filter>combat</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\combat\shoot.c">
       <Filter>combat</Filter>
     </ClCompile>
@@ -631,6 +628,9 @@
     <ClCompile Include="..\..\src\knowledge\knowledge-mutations.c">
       <Filter>knowledge</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\combat\melee.c">
+      <Filter>combat</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 428e17b..9ee4ceb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,7 +181,7 @@ hengband_SOURCES = \
        cmd/cmd-usestaff.c cmd/cmd-usestaff.h \
        cmd/cmd-zaprod.c cmd/cmd-zaprod.h cmd/cmd-zapwand.c cmd/cmd-zapwand.h \
        \
-       combat/melee.h combat/melee1.c combat/shoot.c combat/shoot.h
+       combat/melee.h combat/melee.c combat/shoot.c combat/shoot.h
 
 EXTRA_hengband_SOURCES = \
        angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \

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