[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 1f6c4d0..5ad0871 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -40,53 +40,71 @@
  *
  */
 
-#include "system/angband.h"
-#include "util/util.h"
-#include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す.
-#include "system/angband-version.h"
-
 #include "io/load.h"
-#include "market/building.h"
-#include "io/report.h"
-
+#include "art-definition/art-accessory-types.h"
+#include "birth/quick-start.h"
+#include "cmd-item/cmd-smith.h"
 #include "dungeon/dungeon.h"
-#include "grid/feature.h"
-#include "floor/floor-generate.h"
-#include "grid/trap.h"
-#include "mutation/mutation.h"
-#include "monster/monster.h"
-#include "market/store-util.h"
 #include "dungeon/quest.h"
-#include "market/store.h"
-#include "object/artifact.h"
-#include "player/avatar.h"
-#include "spell/spells-status.h"
-#include "object/object-hook.h"
-#include "floor/wild.h"
-#include "player/patron.h"
-
-#include "floor/floor.h"
+#include "floor/floor-generate.h"
 #include "floor/floor-save.h"
 #include "floor/floor-town.h"
+#include "floor/floor.h"
+#include "floor/wild.h"
+#include "grid/feature.h"
 #include "grid/grid.h"
-
-#include "cmd-pet.h"
-#include "dungeon/dungeon-file.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"
 #include "io/uid-checker.h"
-#include "io/files.h"
-#include "player/player-skill.h"
+#include "locale/japanese.h"
+#include "market/arena.h"
+#include "market/bounty.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-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/object-stack.h"
+#include "object/object-value.h"
+#include "pet/pet-util.h"
+#include "player/avatar.h"
+#include "player/patron.h"
 #include "player/player-class.h"
-#include "player/race-info-table.h"
 #include "player/player-personality.h"
+#include "player/player-races-table.h"
 #include "player/player-sex.h"
+#include "player/player-skill.h"
+#include "player/race-info-table.h"
+#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"
-#include "object/object-kind.h"
-#include "object/object-ego.h"
-#include "io/save.h"
-#include "locale/japanese.h"
-#include "cmd-smith.h"
-#include "birth/quick-start.h"
-#include "player/player-races-table.h"
 
  /*
   * Maximum number of tries for selection of a proper quest monster
@@ -1289,7 +1307,7 @@ static void rd_lore(MONRACE_IDX r_idx)
  * @details
  * In all cases, return the slot (or -1) where the object was placed
  *
- * Note that this is a hacked up version of "inven_carry()".
+ * Note that this is a hacked up version of "store_item_to_inventory()".
  *
  * Also note that it may not correctly "adapt" to "knowledge" bacoming
  * known, the player may have to pick stuff up and drop it again.
@@ -1566,11 +1584,11 @@ static void load_quick_start(void)
        rd_byte(&previous_char.psex);
        byte tmp8u;
        rd_byte(&tmp8u);
-       previous_char.prace = (player_race_table)tmp8u;
+       previous_char.prace = (player_race_type)tmp8u;
        rd_byte(&tmp8u);
        previous_char.pclass = (player_class_type)tmp8u;
        rd_byte(&tmp8u);
-       previous_char.pseikaku = (CHARACTER_IDX)tmp8u;
+       previous_char.pseikaku = (player_personality_type)tmp8u;
        rd_byte(&tmp8u);
        previous_char.realm1 = (REALM_IDX)tmp8u;
        rd_byte(&tmp8u);
@@ -1627,13 +1645,13 @@ static void rd_extra(player_type *creature_ptr)
 
        byte tmp8u;
        rd_byte(&tmp8u);
-       creature_ptr->prace = (player_race_table)tmp8u;
+       creature_ptr->prace = (player_race_type)tmp8u;
 
        rd_byte(&tmp8u);
        creature_ptr->pclass = (player_class_type)tmp8u;
 
        rd_byte(&tmp8u);
-       creature_ptr->pseikaku = (CHARACTER_IDX)tmp8u;
+       creature_ptr->pseikaku = (player_personality_type)tmp8u;
 
        rd_byte(&creature_ptr->psex);
        rd_byte(&tmp8u);
@@ -1734,7 +1752,7 @@ static void rd_extra(player_type *creature_ptr)
        else
        {
                rd_byte(&tmp8u);
-               creature_ptr->start_race = (player_race_table)tmp8u;
+               creature_ptr->start_race = (player_race_type)tmp8u;
                s32b tmp32s;
                rd_s32b(&tmp32s);
                creature_ptr->old_race1 = (BIT_FLAGS)tmp32s;
@@ -3163,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;
                                }
                        }