[Refactor] #40014 Moved monster's info-related functions from monster2.c/h to monster...

[hengband/hengband.git] / src / io / load.c

diff --git a/src/io/load.c b/src/io/load.c
index 7c0da6d..5ad0871 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -41,9 +41,9 @@
  */
 
 #include "io/load.h"
+#include "art-definition/art-accessory-types.h"
 #include "birth/quick-start.h"
 #include "cmd-item/cmd-smith.h"
-#include "dungeon/dungeon-file.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-generate.h"
@@ -54,6 +54,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
+#include "info-reader/fixed-map-parser.h"
 #include "io/files-util.h"
 #include "io/report.h"
 #include "io/save.h"
@@ -61,21 +62,29 @@
 #include "locale/japanese.h"
 #include "market/arena.h"
 #include "market/bounty.h"
-#include "monster/monster.h"
+#include "monster-race/race-flags-resistance.h"
+#include "monster-race/race-flags1.h"
+#include "monster-race/race-flags3.h"
+#include "monster-race/race-flags7.h"
+#include "monster-race/race-indice-types.h"
+#include "monster/monster-flag-types.h"
+#include "monster/monster-info.h"
+#include "monster/monster2.h"
 #include "mutation/mutation.h"
-#include "object/artifact.h"
-#include "object/object-ego.h"
+#include "object-enchant/artifact.h"
+#include "object-enchant/object-ego.h"
+#include "object-enchant/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
+#include "object-enchant/tr-types.h"
+#include "object-enchant/trc-types.h"
+#include "object-enchant/trg-types.h"
+#include "object/object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
+#include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/object2.h"
-#include "object/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
+#include "object/object-stack.h"
 #include "object/object-value.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-lite-types.h"
-#include "object/tr-types.h"
-#include "object/trc-types.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"
 #include "player/patron.h"
@@ -88,8 +97,11 @@
 #include "spell/spells-status.h"
 #include "store/store-util.h"
 #include "store/store.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "system/angband-version.h"
 #include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
+#include "util/object-sort.h"
 #include "util/util.h"
 #include "world/world-object.h"
 #include "world/world.h"
@@ -3169,7 +3181,7 @@ static errr rd_savefile_new_aux(player_type *creature_ptr)
                                        init_flags = INIT_ASSIGN;
                                        creature_ptr->current_floor_ptr->inside_quest = (QUEST_IDX)i;
 
-                                       process_dungeon_file(creature_ptr, "q_info.txt", 0, 0, 0, 0);
+                                       parse_fixed_map(creature_ptr, "q_info.txt", 0, 0, 0, 0);
                                        creature_ptr->current_floor_ptr->inside_quest = old_inside_quest;
                                }
                        }