[Refactor] #38862 Moved artifact.c/h to object/

[hengband/hengband.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 0a823d1..c3951d7 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -30,35 +30,36 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "core.h"
+#include "system/system-variables.h"
+#include "core/angband-version.h"
 #include "io/read-pref-file.h"
 #include "gameterm.h"
 
-#include "artifact.h"
+#include "object/artifact.h"
 #include "market/building.h"
 #include "init.h"
 #include "quest.h"
 #include "trap.h"
-#include "rooms.h"
+#include "room/rooms.h"
 #include "market/store.h"
 #include "wild.h"
-#include "dungeon-file.h"
+#include "dungeon/dungeon-file.h"
 #include "files.h"
 #include "feature.h"
-#include "floor.h"
-#include "floor-town.h"
-#include "dungeon.h"
-#include "rooms-vault.h"
-#include "player-skill.h"
-#include "player-class.h"
+#include "floor/floor.h"
+#include "floor/floor-town.h"
+#include "dungeon/dungeon.h"
+#include "room/rooms-vault.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
 #include "object/object-kind.h"
-#include "object-ego.h"
-#include "rooms-vault.h"
-#include "world.h"
+#include "object/object-ego.h"
+#include "room/rooms-vault.h"
+#include "world/world.h"
 #include "market/articles-on-sale.h"
 #include "market/store-util.h"
 
@@ -1433,7 +1434,7 @@ static void init_angband_aux(concptr why)
  * if needed, in the first (?) pass through "TERM_XTRA_REACT".
  * </pre>
  */
-void init_angband(player_type *player_ptr)
+void init_angband(player_type *player_ptr, void(*process_autopick_file_command)(char*))
 {
        /*** Verify the "news" file ***/
        char buf[1024];
@@ -1606,13 +1607,13 @@ void init_angband(player_type *player_ptr)
        strcpy(buf, "pref.prf");
 
        /* Process that file */
-       process_pref_file(player_ptr, buf);
+       process_pref_file(player_ptr, buf, process_autopick_file_command);
 
        /* Access the "basic" system pref file */
        sprintf(buf, "pref-%s.prf", ANGBAND_SYS);
 
        /* Process that file */
-       process_pref_file(player_ptr, buf);
+       process_pref_file(player_ptr, buf, process_autopick_file_command);
 
        note(_("[初期化終了]", "[Initialization complete]"));
 }