[Refactor] #3217 alloc_entry にget_baseitem() を追加した

diff --git a/src/system/alloc-entries.cpp b/src/system/alloc-entries.cpp
index 17d80b3..3bfe963 100644 (file)
--- a/src/system/alloc-entries.cpp
+++ b/src/system/alloc-entries.cpp
@@ -1,7 +1,13 @@
 #include "system/alloc-entries.h"
+#include "system/baseitem-info.h"
 
 /* The entries in the "race allocator table" */
 std::vector<alloc_entry> alloc_race_table;
 
 /* The entries in the "kind allocator table" */
 std::vector<alloc_entry> alloc_kind_table;
+
+BaseitemInfo &alloc_entry::get_baseitem() const
+{
+    return baseitems_info[this->index];
+}

diff --git a/src/system/alloc-entries.h b/src/system/alloc-entries.h
index c9282b8..c753ebf 100644 (file)
--- a/src/system/alloc-entries.h
+++ b/src/system/alloc-entries.h
@@ -17,12 +17,15 @@
  * Pass 1 is determined from allocation information
  * Pass 2 is determined from allocation restriction
  */
+class BaseitemInfo;
 struct alloc_entry {
     short index; /* The actual index */
 
     DEPTH level; /* Base dungeon level */
     PROB prob1; /* Probability, pass 1 */
     PROB prob2; /* Probability, pass 2 */
+
+    BaseitemInfo &get_baseitem() const;
 };
 
 extern std::vector<alloc_entry> alloc_race_table;

diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index e5c3c1a..403acef 100644 (file)
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -264,7 +264,7 @@ static void prt_alloc(const BaseitemKey &bi_key, TERM_LEN row, TERM_LEN col)
                 prob = entry.prob1 * i * BASEITEM_MAX_DEPTH / (entry.level - 1);
             }
 
-            const auto &baseitem = baseitems_info[entry.index];
+            const auto &baseitem = entry.get_baseitem();
             total[i] += prob / magnificant;
             total_frac += prob % magnificant;
 

diff --git a/src/world/world-object.cpp b/src/world/world-object.cpp
index e6f4a69..528c598 100644 (file)
--- a/src/world/world-object.cpp
+++ b/src/world/world-object.cpp
@@ -86,7 +86,7 @@ OBJECT_IDX get_obj_index(PlayerType *player_ptr, DEPTH level, BIT_FLAGS mode)
             break;
         }
 
-        const auto &baseitem = baseitems_info[entry.index];
+        const auto &baseitem = entry.get_baseitem();
         if ((mode & AM_FORBID_CHEST) && (baseitem.bi_key.tval() == ItemKindType::CHEST)) {
             continue;
         }