[Refactor] #37353 cmd3.c を cmd-item.c に改名して、ヘッダ分離。

Rename cmd3.c to cmd-item.c and separate header file.

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj b/Hengband_vcs2015/Hengband/Hengband.vcxproj
index e4a9efa..8cf2b78 100644 (file)
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj
@@ -148,6 +148,7 @@
     <ClCompile Include="..\..\src\cmd-zaprod.c" />\r
     <ClCompile Include="..\..\src\cmd-zapwand.c" />\r
     <ClInclude Include="..\..\src\chest.h" />\r
+    <ClInclude Include="..\..\src\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r
     <ClInclude Include="..\..\src\cmd-pet.h" />\r
     <ClInclude Include="..\..\src\cmd-zaprod.h" />\r
@@ -156,7 +157,7 @@
     </ClInclude>\r
     <ClCompile Include="..\..\src\cmd1.c" />\r
     <ClCompile Include="..\..\src\cmd2.c" />\r
-    <ClCompile Include="..\..\src\cmd3.c" />\r
+    <ClCompile Include="..\..\src\cmd-item.c" />\r
     <ClCompile Include="..\..\src\cmd4.c" />\r
     <ClCompile Include="..\..\src\cmd5.c" />\r
     <ClCompile Include="..\..\src\cmd-magiceat.c" />\r

diff --git a/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
index ca53fae..561ed3b 100644 (file)
--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClCompile Include="..\..\src\cmd4.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\cmd3.c">\r
-      <Filter>Source</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\cmd5.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
@@ -250,6 +247,9 @@
     <ClCompile Include="..\..\src\cmd-pet.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\cmd-item.c">\r
+      <Filter>Source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h">\r
@@ -367,6 +367,9 @@
     <ClInclude Include="..\..\src\cmd-pet.h">\r
       <Filter>Header</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\cmd-item.h">\r
+      <Filter>Header</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r

diff --git a/src/cmd3.c b/src/cmd-item.c
similarity index 100%
rename from src/cmd3.c
rename to src/cmd-item.c

diff --git a/src/dungeon.c b/src/dungeon.c
index 3e854ce..59dd0a1 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "cmd-activate.h"
 #include "cmd-eat.h"
+#include "cmd-item.h"
 #include "cmd-magiceat.h"
 #include "cmd-quaff.h"
 #include "cmd-read.h"

diff --git a/src/externs.h b/src/externs.h
index ab267ce..a039bb5 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -739,26 +739,6 @@ extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
 extern void do_cmd_travel(void);
 #endif
 
-/* cmd3.c */
-extern void do_cmd_inven(void);
-extern void do_cmd_equip(void);
-extern void do_cmd_wield(void);
-extern void do_cmd_takeoff(void);
-extern void do_cmd_drop(void);
-extern void do_cmd_destroy(void);
-extern void do_cmd_observe(void);
-extern void do_cmd_uninscribe(void);
-extern void do_cmd_inscribe(void);
-extern void do_cmd_refill(void);
-extern void do_cmd_target(void);
-extern void do_cmd_look(void);
-extern void do_cmd_locate(void);
-extern void do_cmd_query_symbol(void);
-extern void kamaenaoshi(int item);
-extern bool ang_sort_comp_hook(vptr u, vptr v, int a, int b);
-extern void ang_sort_swap_hook(vptr u, vptr v, int a, int b);
-extern void do_cmd_use(void);
-
 /* cmd4.c */
 #ifndef JP
 extern cptr get_ordinal_number_suffix(int num);
@@ -1797,3 +1777,8 @@ extern void revenge_store(HIT_POINT dam);
 extern bool teleport_barrier(MONSTER_IDX m_idx);
 extern bool magic_barrier(MONSTER_IDX m_idx);
 extern bool multiply_barrier(MONSTER_IDX m_idx);
+
+extern void kamaenaoshi(int item);
+
+extern bool ang_sort_comp_hook(vptr u, vptr v, int a, int b);
+extern void ang_sort_swap_hook(vptr u, vptr v, int a, int b);

diff --git a/src/store.c b/src/store.c
index cb83300..01a374f 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "cmd-item.h"
 #include "cmd-zapwand.h"
 #include "cmd-magiceat.h"