[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 5ed1aa9..c3951d7 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -30,33 +30,38 @@
  * </pre>
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
+#include "io/uid-checker.h"
 #include "files.h"
-#include "core.h"
-#include "term.h"
+#include "system/system-variables.h"
+#include "core/angband-version.h"
+#include "io/read-pref-file.h"
+#include "gameterm.h"
 
-#include "artifact.h"
-#include "bldg.h"
+#include "object/artifact.h"
+#include "market/building.h"
 #include "init.h"
 #include "quest.h"
 #include "trap.h"
-#include "rooms.h"
-#include "store.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 "objectkind.h"
-#include "object-ego.h"
-#include "rooms-vault.h"
-#include "world.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/object-ego.h"
+#include "room/rooms-vault.h"
+#include "world/world.h"
+#include "market/articles-on-sale.h"
+#include "market/store-util.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -190,45 +195,6 @@ void init_file_paths(char *path)
        /* Build a path name */
        strcpy(tail, "xtra");
        ANGBAND_DIR_XTRA = string_make(path);
-
-
-#ifdef NeXT
-
-       /* Allow "fat binary" usage with NeXT */
-       if (TRUE)
-       {
-               concptr next = NULL;
-
-# if defined(m68k)
-               next = "m68k";
-# endif
-
-# if defined(i386)
-               next = "i386";
-# endif
-
-# if defined(sparc)
-               next = "sparc";
-# endif
-
-# if defined(hppa)
-               next = "hppa";
-# endif
-
-               /* Use special directory */
-               if (next)
-               {
-                       /* Forget the old path name */
-                       string_free(ANGBAND_DIR_DATA);
-
-                       /* Build a new path name */
-                       sprintf(tail, "data-%s", next);
-                       ANGBAND_DIR_DATA = string_make(path);
-               }
-       }
-
-#endif /* NeXT */
-
 }
 
 
@@ -799,7 +765,7 @@ static errr init_towns(void)
                for (int j = 0; j < MAX_STORES; j++)
                {
                        /* Access the store */
-                       store_type *st_ptr = &town_info[i].store[j];
+                       store_type *store_ptr = &town_info[i].store[j];
 
                        if ((i > 1) && (j == STORE_MUSEUM || j == STORE_HOME)) continue;
 
@@ -811,28 +777,28 @@ static errr init_towns(void)
                         */
                        if (j == STORE_HOME)
                        {
-                               st_ptr->stock_size = (STORE_INVEN_MAX * 10);
+                               store_ptr->stock_size = (STORE_INVEN_MAX * 10);
                        }
                        else if (j == STORE_MUSEUM)
                        {
-                               st_ptr->stock_size = (STORE_INVEN_MAX * 50);
+                               store_ptr->stock_size = (STORE_INVEN_MAX * 50);
                        }
                        else
                        {
-                               st_ptr->stock_size = STORE_INVEN_MAX;
+                               store_ptr->stock_size = STORE_INVEN_MAX;
                        }
 
                        /* Allocate the stock */
-                       C_MAKE(st_ptr->stock, st_ptr->stock_size, object_type);
+                       C_MAKE(store_ptr->stock, store_ptr->stock_size, object_type);
 
                        /* No table for the black market or home */
                        if ((j == STORE_BLACK) || (j == STORE_HOME) || (j == STORE_MUSEUM)) continue;
 
                        /* Assume full table */
-                       st_ptr->table_size = STORE_CHOICES;
+                       store_ptr->table_size = STORE_CHOICES;
 
                        /* Allocate the stock */
-                       C_MAKE(st_ptr->table, st_ptr->table_size, s16b);
+                       C_MAKE(store_ptr->table, store_ptr->table_size, s16b);
 
                        /* Scan the choices */
                        for (int k = 0; k < STORE_CHOICES; k++)
@@ -856,7 +822,7 @@ static errr init_towns(void)
                                if (k_idx == max_k_idx) continue;
 
                                /* Add that item index to the table */
-                               st_ptr->table[st_ptr->table_num++] = k_idx;
+                               store_ptr->table[store_ptr->table_num++] = k_idx;
                        }
                }
        }
@@ -1468,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];
@@ -1641,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]"));
 }