From 8a3c6037837028a96df74f5714a1c311e8ff7d80 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 5 Jul 2020 19:20:01 +0900
Subject: [PATCH] [Refactor] #40467 Removed unused headers in load.c

---
 src/savedata/load.c | 70 ++++-------------------------------------------------
 src/savedata/load.h |  2 +-
 src/savedata/save.c |  2 +-
 3 files changed, 7 insertions(+), 67 deletions(-)

diff --git a/src/savedata/load.c b/src/savedata/load.c
index 0e6770d0f..ea0d34e49 100644
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -10,103 +10,44 @@
  */
 
 #include "savedata/load.h"
-#include "art-definition/art-accessory-types.h"
-#include "birth/quick-start.h"
-#include "cmd-building/cmd-building.h"
-#include "cmd-io/cmd-gameoption.h"
-#include "cmd-item/cmd-smith.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.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 "game-option/birth-options.h"
-#include "game-option/cheat-options.h"
-#include "game-option/option-flags.h"
 #include "game-option/runtime-arguments.h"
-#include "game-option/special-options.h"
-#include "grid/feature.h"
-#include "grid/grid.h"
-#include "grid/trap.h"
 #include "info-reader/fixed-map-parser.h"
-#include "inventory/inventory-slot-types.h"
 #include "io/report.h"
 #include "io/uid-checker.h"
-#include "locale/japanese.h"
-#include "market/arena.h"
-#include "market/bounty.h"
-#include "mind/mind-weaponsmith.h"
-#include "monster-floor/monster-move.h"
 #include "monster-race/monster-race.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/monster-list.h"
-#include "mutation/mutation.h"
 #include "object-enchant/artifact.h"
-#include "object-enchant/object-ego.h"
-#include "object-enchant/tr-types.h"
-#include "object-enchant/trc-types.h"
 #include "object-enchant/trg-types.h"
-#include "object-hook/hook-checker.h"
-#include "object-hook/hook-enchant.h"
-#include "object/object-flags.h"
-#include "object/object-generator.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/player-personality.h"
-#include "player/player-race-types.h"
+#include "player/player-race.h"
 #include "player/player-sex.h"
-#include "player/player-skill.h"
 #include "player/race-info-table.h"
-#include "player/special-defense-types.h"
 #include "savedata/angband-version-comparer.h"
-#include "savedata/birth-loader.h"
-#include "savedata/dungeon-loader.h"
 #include "savedata/dummy-loader.h"
+#include "savedata/dungeon-loader.h"
 #include "savedata/extra-loader.h"
-#include "savedata/floor-loader.h"
 #include "savedata/inventory-loader.h"
-#include "savedata/item-loader.h"
 #include "savedata/load-util.h"
 #include "savedata/load-v1-5-0.h"
-#include "savedata/load-zangband.h"
 #include "savedata/lore-loader.h"
-#include "savedata/monster-loader.h"
-#include "savedata/old-feature-types.h"
 #include "savedata/option-loader.h"
-#include "savedata/player-info-loader.h"
-#include "savedata/save.h"
-#include "savedata/savedata-flag-types.h"
 #include "savedata/store-loader.h"
+#include "savedata/player-info-loader.h"
 #include "savedata/world-loader.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 "term/screen-processor.h"
+#include "system/system-variables.h"
 #include "util/angband-files.h"
-#include "util/bit-flags-calculator.h"
-#include "util/object-sort.h"
-#include "util/quarks.h"
 #include "view/display-messages.h"
-#include "world/world-object.h"
 #include "world/world.h"
 
 /*!
@@ -149,9 +90,8 @@ static void rd_randomizer(void)
     u16b tmp16u;
     rd_u16b(&tmp16u);
     rd_u16b(&Rand_place);
-    for (int i = 0; i < RAND_DEG; i++) {
+    for (int i = 0; i < RAND_DEG; i++)
         rd_u32b(&Rand_state[i]);
-    }
 }
 
 /*!
diff --git a/src/savedata/load.h b/src/savedata/load.h
index e78d3db96..688f579ed 100644
--- a/src/savedata/load.h
+++ b/src/savedata/load.h
@@ -3,4 +3,4 @@
 #include "floor/floor-save.h"
 #include "system/angband.h"
 
-errr rd_savefile_new(player_type *player_ptr);
+errr rd_savefile(player_type *player_ptr);
diff --git a/src/savedata/save.c b/src/savedata/save.c
index 5ed24862d..98376e5ae 100644
--- a/src/savedata/save.c
+++ b/src/savedata/save.c
@@ -1683,7 +1683,7 @@ bool load_player(player_type *player_ptr)
         Term_clear();
 
         /* Attempt to load */
-        err = rd_savefile_new(player_ptr);
+        err = rd_savefile(player_ptr);
 
         /* Message (below) */
         if (err)
-- 
2.11.0