[Refactor] #39970 Moved dungeon*.c/h to dungeon/

[hengband/hengband.git] / src / main-win.c

diff --git a/src/main-win.c b/src/main-win.c
index 93cb749..43774ec 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -90,16 +90,18 @@
 */
 
 #include "angband.h"
-#include "signal-handlers.h"
+#include "io/signal-handlers.h"
 #include "main/sound-definitions-table.h"
+#include "main/music-definitions-table.h"
 #include "util.h"
 #include "inet.h"
 #include "chuukei.h"
 
 #include "io/write-diary.h"
-#include "cmd/cmd-dump.h"
+#include "autopick/autopick-pref-processor.h"
+#include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-save.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "init.h"
@@ -108,7 +110,11 @@
 #include "quest.h"
 #include "files.h"
 #include "core.h"
-#include "world.h"
+#include "core/angband-version.h"
+#include "core/stuff-handler.h"
+#include "core/special-internal-keys.h"
+#include "core/player-processor.h"
+#include "world/world.h"
 #include "gameterm.h"
 
 #ifdef WINDOWS
@@ -117,7 +123,7 @@
 #include <locale.h>
 #include "z-term.h"
 #include "save.h"
-#include "dungeon.h"
+#include "dungeon/dungeon.h"
 
 /*
  * Available graphic modes
@@ -254,34 +260,6 @@
 #define MOUSE_SENS 40
 
 /*
- * Standard music names
- */
-const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
-{
-       "default",
-       "gameover",
-       "exit",
-       "town",
-       "field1",
-       "field2",
-       "field3",
-       "dun_low",
-       "dun_med",
-       "dun_high",
-       "feel1",
-       "feel2",
-       "winner",
-       "build",
-       "wild",
-       "quest",
-       "arena",
-       "battle",
-       "quest_clear",
-       "final_quest_clear",
-       "ambush",
-};
-
-/*
  * Include some more files. Note: the Cygnus Cygwin compiler
  * doesn't use mmsystem.h instead it includes the winmm library
  * which performs a similar function.
@@ -1467,7 +1445,7 @@ static errr term_xtra_win_react(player_type *player_ptr)
                }
 
                use_graphics = arg_graphics;
-               reset_visuals(player_ptr);
+               reset_visuals(player_ptr, process_autopick_file_command);
        }
 
        for (int i = 0; i < MAX_TERM_DATA; i++)
@@ -3880,7 +3858,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
 
        signals_init();
        Term_activate(term_screen);
-       init_angband(p_ptr);
+       init_angband(p_ptr, process_autopick_file_command);
        initialized = TRUE;
 #ifdef CHUUKEI
        if (lpCmdLine[0] == '-') {