From 345334f9f046387033048b3f8d26eebb0adab247 Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sun, 17 Oct 2021 14:42:07 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#1796=20get=5Fitem=5Floader()=20?=
 =?utf8?q?=E3=81=AF=E5=86=97=E9=95=B7=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=AE?=
 =?utf8?q?=E3=81=A7create=5Floader()=20=E3=81=AB=E7=B0=A1=E7=95=A5?=
 =?utf8?q?=E5=8C=96=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/load/floor-loader.cpp             | 2 +-
 src/load/inventory-loader.cpp         | 2 +-
 src/load/item/item-loader-factory.cpp | 2 +-
 src/load/item/item-loader-factory.h   | 2 +-
 src/load/load.cpp                     | 2 +-
 src/load/old/load-v1-5-0.cpp          | 2 +-
 src/load/store-loader.cpp             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/load/floor-loader.cpp b/src/load/floor-loader.cpp
index dbf18ac5d..0c938990b 100644
--- a/src/load/floor-loader.cpp
+++ b/src/load/floor-loader.cpp
@@ -156,7 +156,7 @@ errr rd_saved_floor(player_type *player_ptr, saved_floor_type *sf_ptr)
     if (limit > w_ptr->max_o_idx)
         return 151;
 
-    auto item_loader = ItemLoaderFactory::get_item_loader();
+    auto item_loader = ItemLoaderFactory::create_loader();
     for (int i = 1; i < limit; i++) {
         auto o_idx = o_pop(floor_ptr);
         if (i != o_idx) {
diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp
index 4883cada1..0c737fc63 100644
--- a/src/load/inventory-loader.cpp
+++ b/src/load/inventory-loader.cpp
@@ -28,7 +28,7 @@ static errr rd_inventory(player_type *player_ptr)
     player_ptr->inventory_list = std::shared_ptr<object_type[]>{ new object_type[INVEN_TOTAL] };
 
     int slot = 0;
-    auto item_loader = ItemLoaderFactory::get_item_loader();
+    auto item_loader = ItemLoaderFactory::create_loader();
     while (true) {
         auto n = rd_u16b();
 
diff --git a/src/load/item/item-loader-factory.cpp b/src/load/item/item-loader-factory.cpp
index 428a07045..6c9fd290a 100644
--- a/src/load/item/item-loader-factory.cpp
+++ b/src/load/item/item-loader-factory.cpp
@@ -16,7 +16,7 @@
  * @details ItemLoaderBaseは純粋仮想関数を含むので参照を返す必要がある.
  * (値を返す設計はコンパイルエラー)
  */
-std::shared_ptr<ItemLoaderBase> ItemLoaderFactory::get_item_loader()
+std::shared_ptr<ItemLoaderBase> ItemLoaderFactory::create_loader()
 {
     auto version = get_version();
     switch (version) {
diff --git a/src/load/item/item-loader-factory.h b/src/load/item/item-loader-factory.h
index 74d580711..9c2d4d2a3 100644
--- a/src/load/item/item-loader-factory.h
+++ b/src/load/item/item-loader-factory.h
@@ -6,7 +6,7 @@ enum class ItemLoaderVersionType;
 class ItemLoaderBase;
 class ItemLoaderFactory {
 public:
-    static std::shared_ptr<ItemLoaderBase> get_item_loader();
+    static std::shared_ptr<ItemLoaderBase> create_loader();
 
 private:
     ItemLoaderFactory() = delete;
diff --git a/src/load/load.cpp b/src/load/load.cpp
index 757c3d95d..cc2bdb6be 100644
--- a/src/load/load.cpp
+++ b/src/load/load.cpp
@@ -185,7 +185,7 @@ static errr exe_reading_savefile(player_type *player_ptr)
     rd_dummy3();
     rd_system_info();
     load_lore();
-    auto item_loader = ItemLoaderFactory::get_item_loader();
+    auto item_loader = ItemLoaderFactory::create_loader();
     item_loader->load_item();
     errr load_town_quest_result = load_town_quest(player_ptr);
     if (load_town_quest_result != 0)
diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 032e45165..9fe15520b 100644
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -681,7 +681,7 @@ errr rd_dungeon_old(player_type *player_ptr)
         return (151);
     }
 
-    auto item_loader = ItemLoaderFactory::get_item_loader();
+    auto item_loader = ItemLoaderFactory::create_loader();
     for (int i = 1; i < limit; i++) {
         OBJECT_IDX o_idx = o_pop(floor_ptr);
         if (i != o_idx) {
diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index 3eed21a33..902e3e296 100644
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -93,7 +93,7 @@ static void rd_store(player_type *player_ptr, int town_number, int store_number)
     store_ptr->bad_buy = rd_s16b();
     store_ptr->last_visit = rd_s32b();
 
-    auto item_loader = ItemLoaderFactory::get_item_loader();
+    auto item_loader = ItemLoaderFactory::create_loader();
     for (int j = 0; j < inven_num; j++) {
         object_type item;
         item_loader->rd_item(&item);
-- 
2.11.0