[Refactor] #39970 Renamed wizard1/2.c to wizard-spolier/special-process.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index cdfa755..1537863 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -500,8 +500,8 @@
     <ClCompile Include="..\..\src\view\display-main-window.c" />\r
     <ClCompile Include="..\..\src\warning.c" />\r
     <ClCompile Include="..\..\src\wild.c" />\r
-    <ClCompile Include="..\..\src\wizard1.c" />\r
-    <ClCompile Include="..\..\src\wizard2.c" />\r
+    <ClCompile Include="..\..\src\wizard\wizard-spoiler.c" />\r
+    <ClCompile Include="..\..\src\wizard\wizard-special-process.c" />\r
     <ClCompile Include="..\..\src\world.c" />\r
     <ClCompile Include="..\..\src\z-form.c" />\r
     <ClCompile Include="..\..\src\z-rand.c" />\r
@@ -601,6 +601,8 @@
     <ClInclude Include="..\..\src\player\process-death.h" />\r
     <ClInclude Include="..\..\src\view\display-player-misc-info.h" />\r
     <ClInclude Include="..\..\src\view\status-first-page.h" />\r
+    <ClInclude Include="..\..\src\wizard\wizard-special-process.h" />\r
+    <ClInclude Include="..\..\src\wizard\wizard-spoiler.h" />\r
     <ClInclude Include="japanese.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 583347c..c04a454 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -229,12 +229,6 @@
     <ClCompile Include="..\..\src\z-rand.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\wizard2.c">
-      <Filter>cmd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\wizard1.c">
-      <Filter>cmd</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\report.c">
       <Filter>io</Filter>
     </ClCompile>
@@ -802,6 +796,12 @@
     <ClCompile Include="..\..\src\inventory\recharge-processor.c">
       <Filter>inventory</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\wizard\wizard-spoiler.c">
+      <Filter>wizard</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\wizard\wizard-special-process.c">
+      <Filter>wizard</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1631,6 +1631,12 @@
     <ClInclude Include="..\..\src\inventory\recharge-processor.h">
       <Filter>inventory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\wizard\wizard-spoiler.h">
+      <Filter>wizard</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\wizard\wizard-special-process.h">
+      <Filter>wizard</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -1703,6 +1709,9 @@
     <Filter Include="mutation">
       <UniqueIdentifier>{0e652835-2887-4970-9fa2-4ba77974e921}</UniqueIdentifier>
     </Filter>
+    <Filter Include="wizard">
+      <UniqueIdentifier>{22328846-3669-435a-9731-f0998a1c3dfa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 425343c..9453c90 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -260,7 +260,10 @@ 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/melee.c combat/shoot.c combat/shoot.h
+       combat/melee.h combat/melee.c combat/shoot.c combat/shoot.h \
+       \
+       wizard/wizard-spoiler.c wizard/wizard-spoiler.h\
+       wizard/wizard-special-process.c wizard/wizard-special-process.h
 
 EXTRA_hengband_SOURCES = \
        angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \

diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h
index 0911580..e1ba5bc 100644 (file)
--- a/src/cmd/cmd-dump.h
+++ b/src/cmd/cmd-dump.h
@@ -6,11 +6,3 @@ extern void do_cmd_note(void);
 extern void do_cmd_version(void);
 extern void do_cmd_feeling(player_type *creature_ptr);
 extern void do_cmd_time(player_type *creature_ptr);
-
-/*
- * Forward declare
- */
-extern void do_cmd_spoilers(player_type *creature_ptr);
-
-/* wizard1.c */
-extern void spoil_random_artifact(player_type *creature_ptr, concptr fname);

diff --git a/src/core.c b/src/core.c
index 4fcfff6..7f2feb3 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -115,6 +115,8 @@
 #include "core/magic-effects-timeout-reducer.h"
 #include "inventory/inventory-curse.h"
 #include "inventory/recharge-processor.h"
+#include "wizard/wizard-spoiler.h"
+#include "wizard/wizard-special-process.h"
 
  /*!
   * コピーライト情報 /
@@ -692,12 +694,6 @@ static bool enter_debug_mode(player_type *player_ptr)
        return TRUE;
 }
 
-/*
- * todo これが多重インクルード問題の原因 (の1つ)かもしれない、wizard2.cに同名の関数が存在する
- * Hack -- Declare the Debug Routines
- */
-extern void do_cmd_debug(player_type *creature_ptr);
-
 /*!
  * @brief プレイヤーから受けた入力コマンドの分岐処理。
  * / Parse and execute the current command Give "Warning" on illegal commands.

diff --git a/src/wizard2.c b/src/wizard/wizard-special-process.c
similarity index 99%
rename from src/wizard2.c
rename to src/wizard/wizard-special-process.c
index 6f4c742..3da621f 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard/wizard-special-process.c
@@ -11,6 +11,8 @@
  */
 
 #include "angband.h"
+#include "wizard/wizard-special-process.h"
+#include "wizard/wizard-spoiler.h"
 #include "core/angband-version.h"
 #include "core/stuff-handler.h"
 #include "gameterm.h"
@@ -62,8 +64,6 @@
 #define NUM_O_SET 8
 #define NUM_O_BIT 32
 
-extern void do_cmd_debug(player_type *creature_ptr);
-
 typedef union spell_functions {
        struct debug_spell_type1 { bool(*spell_function)(player_type *, floor_type *); } spell1;
        struct debug_spell_type2 { bool(*spell_function)(player_type *); } spell2;

diff --git a/src/wizard/wizard-special-process.h b/src/wizard/wizard-special-process.h
new file mode 100644 (file)
index 0000000..381343d
--- /dev/null
+++ b/src/wizard/wizard-special-process.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void do_cmd_debug(player_type* creature_ptr);

diff --git a/src/wizard1.c b/src/wizard/wizard-spoiler.c
similarity index 99%
rename from src/wizard1.c
rename to src/wizard/wizard-spoiler.c
index d926613..bfb92d5 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard/wizard-spoiler.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "wizard/wizard-spoiler.h"
 #include "util.h"
 #include "gameterm.h"
 

diff --git a/src/wizard/wizard-spoiler.h b/src/wizard/wizard-spoiler.h
new file mode 100644 (file)
index 0000000..24fbbaf
--- /dev/null
+++ b/src/wizard/wizard-spoiler.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void do_cmd_spoilers(player_type* player_ptr);
+void spoil_random_artifact(player_type* creature_ptr, concptr fname);