[Refactor] #37353 cmd-mane.h を作成して変数宣言移動。 mane.c を cmd-mane.c に改名。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index fc7fdbf..7fd1a1f 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -144,6 +144,7 @@
     <ClCompile Include="..\..\src\cmd-activate.c" />\r
     <ClCompile Include="..\..\src\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\cmd-hissatsu.c" />\r
+    <ClCompile Include="..\..\src\cmd-mane.c" />\r
     <ClCompile Include="..\..\src\cmd-pet.c" />\r
     <ClCompile Include="..\..\src\cmd-quaff.c" />\r
     <ClCompile Include="..\..\src\cmd-read.c" />\r
@@ -184,6 +185,7 @@
     <ClInclude Include="..\..\src\cmd-hissatsu.h" />\r
     <ClInclude Include="..\..\src\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r
+    <ClInclude Include="..\..\src\cmd-mane.h" />\r
     <ClInclude Include="..\..\src\cmd-pet.h" />\r
     <ClInclude Include="..\..\src\cmd-smith.h" />\r
     <ClInclude Include="..\..\src\cmd-spell.h" />\r
@@ -209,7 +211,6 @@
     <ClCompile Include="..\..\src\japanese.c" />\r
     <ClCompile Include="..\..\src\load.c" />\r
     <ClCompile Include="..\..\src\main-win.c" />\r
-    <ClCompile Include="..\..\src\mane.c" />\r
     <ClCompile Include="..\..\src\melee1.c" />\r
     <ClCompile Include="..\..\src\mind.c" />\r
     <ClCompile Include="..\..\src\monster1.c" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index badf65e..a5949a6 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -27,7 +27,6 @@
     <ClCompile Include="..\..\src\japanese.c" />
     <ClCompile Include="..\..\src\load.c" />
     <ClCompile Include="..\..\src\main-win.c" />
-    <ClCompile Include="..\..\src\mane.c" />
     <ClCompile Include="..\..\src\melee1.c" />
     <ClCompile Include="..\..\src\mind.c" />
     <ClCompile Include="..\..\src\racial.c" />
@@ -252,6 +251,9 @@
     <ClCompile Include="..\..\src\object-boost.c">
       <Filter>object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd-mane.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />
@@ -457,6 +459,9 @@
     <ClInclude Include="..\..\src\cmd-hissatsu.h">
       <Filter>cmd</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd-mane.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index e102ef5..2443279 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,8 @@ hengband_SOURCES = \
        \
        birth.c bldg.c chest.c chest.h chuukei.c \
        cmd2.c cmd4.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
-       cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h cmd-pet.c cmd-pet.h \
+       cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \
+       cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \
        cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \
        cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \
        cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\
@@ -31,7 +32,7 @@ hengband_SOURCES = \
        generate.h grid.c grid.h h-basic.h h-config.h h-define.h \
        history.h history.c \
        h-system.h h-type.h inet.c init1.c init2.c init.h japanese.c load.c \
-       main.c main-x11.c main-gcu.c mane.c \
+       main.c main-x11.c main-gcu.c \
        melee.h melee1.c mind.c \
        \
        monster.h \

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

diff --git a/src/cmd-mane.h b/src/cmd-mane.h
new file mode 100644 (file)
index 0000000..80a71fb
--- /dev/null
+++ b/src/cmd-mane.h
@@ -0,0 +1,4 @@
+#pragma once
+
+/* mane.c */
+extern bool do_cmd_mane(bool baigaesi);

diff --git a/src/dungeon.c b/src/dungeon.c
index 430e853..a585858 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -16,6 +16,7 @@
 #include "cmd-hissatsu.h"
 #include "cmd-item.h"
 #include "cmd-magiceat.h"
+#include "cmd-mane.h"
 #include "cmd-quaff.h"
 #include "cmd-read.h"
 #include "cmd-smith.h"

diff --git a/src/externs.h b/src/externs.h
index 734d809..e8bba77 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1157,8 +1157,6 @@ extern void mindcraft_info(char *p, int use_mind, int power);
 extern void do_cmd_mind(void);
 extern void do_cmd_mind_browse(void);
 
-/* mane.c */
-extern bool do_cmd_mane(bool baigaesi);
 
 /* mspells1.c */
 extern bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend);

diff --git a/src/racial.c b/src/racial.c
index 0bf03f3..c1a972e 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "cmd-magiceat.h"
+#include "cmd-mane.h"
 #include "cmd-zapwand.h"
 #include "cmd-pet.h"
 #include "melee.h"