[Refactor] #40236 Removed dependency from cmd-process-screen to core

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 65aced8..0abb978 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="..\..\src\autopick.c" />\r
     <ClCompile Include="..\..\src\avatar.c" />\r
     <ClCompile Include="..\..\src\birth.c" />\r
-    <ClCompile Include="..\..\src\cmd\cmd-sprocess-screen.c" />\r
+    <ClCompile Include="..\..\src\cmd\cmd-process-screen.c" />\r
     <ClCompile Include="..\..\src\main\music-definitions-table.c" />\r
     <ClCompile Include="..\..\src\main\sound-definitions-table.c" />\r
     <ClCompile Include="..\..\src\market\building.c" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 4e3bae0..2d896ff 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -592,7 +592,7 @@
     <ClCompile Include="..\..\src\main\music-definitions-table.c">
       <Filter>main</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd\cmd-sprocess-screen.c">
+    <ClCompile Include="..\..\src\cmd\cmd-process-screen.c">
       <Filter>cmd</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index a9679a6..deae6fe 100644 (file)
--- a/src/cmd/cmd-process-screen.c
+++ b/src/cmd/cmd-process-screen.c
@@ -8,7 +8,6 @@
 #include "angband.h"
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-draw.h"
-#include "core.h" // 暫定、後で消す.
 #include "files.h"
 #include "gameterm.h"
 
@@ -182,7 +181,7 @@ static void do_cmd_save_screen_html(void)
  * @param creature_ptr プレーヤーへの参照ポインタ
  * @return なし
  */
-void do_cmd_save_screen(player_type *creature_ptr)
+void do_cmd_save_screen(player_type *creature_ptr, void(*handle_stuff)(player_type*))
 {
        prt(_("記念撮影しますか？ [(y)es/(h)tml/(n)o] ", "Save screen dump? [(y)es/(h)tml/(n)o] "), 0, 0);
        bool html_dump = FALSE;
@@ -212,7 +211,7 @@ void do_cmd_save_screen(player_type *creature_ptr)
                use_graphics = FALSE;
                reset_visuals(creature_ptr);
                creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-               handle_stuff(creature_ptr);
+               (*handle_stuff)(creature_ptr);
        }
 
        if (html_dump)

diff --git a/src/cmd/cmd-process-screen.h b/src/cmd/cmd-process-screen.h
index 0060212..0988ddf 100644 (file)
--- a/src/cmd/cmd-process-screen.h
+++ b/src/cmd/cmd-process-screen.h
@@ -1,5 +1,5 @@
 #pragma once
 
 void do_cmd_save_screen_html_aux(char *filename, int message);
-void do_cmd_save_screen(player_type *creature_ptr);
+void do_cmd_save_screen(player_type *creature_ptr, void(*handle_stuff)(player_type*));
 void do_cmd_load_screen(void);

diff --git a/src/core.c b/src/core.c
index 45aa909..e6b75e5 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3516,7 +3516,7 @@ static void process_command(player_type *creature_ptr)
        }
        case ')':
        {
-               do_cmd_save_screen(creature_ptr);
+               do_cmd_save_screen(creature_ptr, handle_stuff);
                break;
        }
        case ']':

diff --git a/src/market/store.c b/src/market/store.c
index 6889378..34d0a69 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -2017,7 +2017,7 @@ static void store_process_command(player_type *client_ptr)
        }
        case ')':
        {
-               do_cmd_save_screen(client_ptr);
+               do_cmd_save_screen(client_ptr, handle_stuff);
                break;
        }
        default:

diff --git a/src/player-damage.c b/src/player-damage.c
index 7850088..4c0c872 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -567,7 +567,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
 
                        if (get_check_strict(_("画面を保存しますか？", "Dump the screen? "), CHECK_NO_HISTORY))
                        {
-                               do_cmd_save_screen(creature_ptr);
+                               do_cmd_save_screen(creature_ptr, handle_stuff);
                        }
 
                        flush();