[Refactor] #2797 Renamed BaseItemInfo to BaseitemInfo

diff --git a/src/flavor/flavor-util.h b/src/flavor/flavor-util.h
index 52ff87e..7753abe 100644 (file)
--- a/src/flavor/flavor-util.h
+++ b/src/flavor/flavor-util.h
@@ -5,7 +5,7 @@
 
 #include "object-enchant/tr-flags.h"
 
-class BaseItemInfo;
+class BaseitemInfo;
 class ObjectType;
 struct flavor_type {
     char *buf;
@@ -35,8 +35,8 @@ struct flavor_type {
     char fake_insc_buf[30];
     TrFlags tr_flags;
     ObjectType *bow_ptr;
-    BaseItemInfo *k_ptr;
-    BaseItemInfo *flavor_k_ptr;
+    BaseitemInfo *k_ptr;
+    BaseitemInfo *flavor_k_ptr;
     int avgdam;
 };
 

diff --git a/src/info-reader/baseitem-reader.cpp b/src/info-reader/baseitem-reader.cpp
index 3cc874b..55bc93a 100644 (file)
--- a/src/info-reader/baseitem-reader.cpp
+++ b/src/info-reader/baseitem-reader.cpp
@@ -19,12 +19,12 @@
 
 /*!
  * @brief テキストトークンを走査してフラグを一つ得る(ベースアイテム用) /
- * Grab one flag in an BaseItemInfo from a textual string
+ * Grab one flag in an BaseitemInfo from a textual string
  * @param k_ptr 保管先のベースアイテム構造体参照ポインタ
  * @param what 参照元の文字列ポインタ
  * @return 見つけたらtrue
  */
-static bool grab_one_baseitem_flag(BaseItemInfo *k_ptr, std::string_view what)
+static bool grab_one_baseitem_flag(BaseitemInfo *k_ptr, std::string_view what)
 {
     if (TrFlags::grab_one_flag(k_ptr->flags, baseitem_flags, what)) {
         return true;
@@ -47,7 +47,7 @@ static bool grab_one_baseitem_flag(BaseItemInfo *k_ptr, std::string_view what)
 errr parse_baseitems_info(std::string_view buf, angband_header *head)
 {
     (void)head;
-    static BaseItemInfo *k_ptr = nullptr;
+    static BaseitemInfo *k_ptr = nullptr;
     const auto &tokens = str_split(buf, ':', false, 10);
 
     if (tokens[0] == "N") {

diff --git a/src/io/interpret-pref-file.cpp b/src/io/interpret-pref-file.cpp
index 70b66ff..77c83b9 100644 (file)
--- a/src/io/interpret-pref-file.cpp
+++ b/src/io/interpret-pref-file.cpp
@@ -72,7 +72,7 @@ static errr interpret_k_token(char *buf)
         return 1;
     }
 
-    BaseItemInfo *k_ptr;
+    BaseitemInfo *k_ptr;
     int i = (int)strtol(zz[0], nullptr, 0);
     TERM_COLOR n1 = (TERM_COLOR)strtol(zz[1], nullptr, 0);
     auto n2 = static_cast<char>(strtol(zz[2], nullptr, 0));

diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index c00de95..58f79f5 100644 (file)
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -181,7 +181,7 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
     int i;
     for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++) {
         TERM_COLOR a;
-        BaseItemInfo *flavor_k_ptr;
+        BaseitemInfo *flavor_k_ptr;
         KIND_OBJECT_IDX k_idx = object_idx[object_top + i];
         auto *k_ptr = &baseitems_info[k_idx];
         TERM_COLOR attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
@@ -277,7 +277,7 @@ void do_cmd_knowledge_objects(PlayerType *player_ptr, bool *need_redraw, bool vi
         object_cnt = 0;
     } else {
         auto *k_ptr = &baseitems_info[direct_k_idx];
-        BaseItemInfo *flavor_k_ptr;
+        BaseitemInfo *flavor_k_ptr;
 
         if (!visual_only && k_ptr->flavor) {
             flavor_k_ptr = &baseitems_info[k_ptr->flavor];
@@ -303,7 +303,7 @@ void do_cmd_knowledge_objects(PlayerType *player_ptr, bool *need_redraw, bool vi
     bool redraw = true;
     int column = 0;
     while (!flag) {
-        BaseItemInfo *k_ptr, *flavor_k_ptr;
+        BaseitemInfo *k_ptr, *flavor_k_ptr;
 
         if (redraw) {
             clear_from(0);

diff --git a/src/load/item/item-loader-base.cpp b/src/load/item/item-loader-base.cpp
index 3a2d90c..f45ad05 100644 (file)
--- a/src/load/item/item-loader-base.cpp
+++ b/src/load/item/item-loader-base.cpp
@@ -13,7 +13,7 @@
 void ItemLoaderBase::load_item(void)
 {
     auto loading_max_k_idx = rd_u16b();
-    BaseItemInfo dummy;
+    BaseitemInfo dummy;
     for (auto i = 0U; i < loading_max_k_idx; i++) {
         auto *k_ptr = i < baseitems_info.size() ? &baseitems_info[i] : &dummy;
         auto tmp8u = rd_byte();

diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp
index c183b75..b210417 100644 (file)
--- a/src/market/building-craft-fix.cpp
+++ b/src/market/building-craft-fix.cpp
@@ -175,7 +175,7 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost)
     } else {
         auto tval = (one_in_(5) ? mo_ptr->tval : ItemKindType::SWORD);
         while (true) {
-            BaseItemInfo *ck_ptr;
+            BaseitemInfo *ck_ptr;
             k_idx = lookup_baseitem_id({ tval });
             ck_ptr = &baseitems_info[k_idx];
 
@@ -204,7 +204,7 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost)
     dd_bonus += mo_ptr->dd - baseitems_info[mo_ptr->k_idx].dd;
     ds_bonus += mo_ptr->ds - baseitems_info[mo_ptr->k_idx].ds;
 
-    BaseItemInfo *k_ptr;
+    BaseitemInfo *k_ptr;
     k_ptr = &baseitems_info[k_idx];
     o_ptr->k_idx = k_idx;
     o_ptr->weight = k_ptr->weight;

diff --git a/src/market/building-recharger.cpp b/src/market/building-recharger.cpp
index 05a4ea7..1726aa5 100644 (file)
--- a/src/market/building-recharger.cpp
+++ b/src/market/building-recharger.cpp
@@ -47,7 +47,7 @@ void building_recharge(PlayerType *player_ptr)
         return;
     }
 
-    BaseItemInfo *k_ptr;
+    BaseitemInfo *k_ptr;
     k_ptr = &baseitems_info[o_ptr->k_idx];
 
     /*
@@ -196,7 +196,7 @@ void building_recharge_all(PlayerType *player_ptr)
         }
 
         DEPTH lev = baseitems_info[o_ptr->k_idx].level;
-        BaseItemInfo *k_ptr;
+        BaseitemInfo *k_ptr;
         k_ptr = &baseitems_info[o_ptr->k_idx];
 
         switch (o_ptr->tval) {
@@ -244,7 +244,7 @@ void building_recharge_all(PlayerType *player_ptr)
     for (INVENTORY_IDX i = 0; i < INVEN_PACK; i++) {
         ObjectType *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        BaseItemInfo *k_ptr;
+        BaseitemInfo *k_ptr;
         k_ptr = &baseitems_info[o_ptr->k_idx];
 
         if ((o_ptr->tval < ItemKindType::STAFF) || (o_ptr->tval > ItemKindType::ROD)) {

diff --git a/src/mind/mind-mage.cpp b/src/mind/mind-mage.cpp
index 839a571..287e899 100644 (file)
--- a/src/mind/mind-mage.cpp
+++ b/src/mind/mind-mage.cpp
@@ -41,7 +41,7 @@ bool eat_magic(PlayerType *player_ptr, int power)
         return false;
     }
 
-    BaseItemInfo *k_ptr;
+    BaseitemInfo *k_ptr;
     k_ptr = &baseitems_info[o_ptr->k_idx];
     DEPTH lev = baseitems_info[o_ptr->k_idx].level;
 

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index 90cb7b2..3b33ab6 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -228,7 +228,7 @@ bool process_un_power(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
     }
 
     bool is_magic_mastery = has_magic_mastery(player_ptr) != 0;
-    BaseItemInfo *kind_ptr = &baseitems_info[monap_ptr->o_ptr->k_idx];
+    BaseitemInfo *kind_ptr = &baseitems_info[monap_ptr->o_ptr->k_idx];
     PARAMETER_VALUE pval = kind_ptr->pval;
     DEPTH level = monap_ptr->rlev;
     auto drain = is_magic_mastery ? std::min<short>(pval, pval * level / 400 + pval * randint1(level) / 400) : pval;

diff --git a/src/spell-kind/magic-item-recharger.cpp b/src/spell-kind/magic-item-recharger.cpp
index e687087..5c50083 100644 (file)
--- a/src/spell-kind/magic-item-recharger.cpp
+++ b/src/spell-kind/magic-item-recharger.cpp
@@ -59,7 +59,7 @@ bool recharge(PlayerType *player_ptr, int power)
         return false;
     }
 
-    BaseItemInfo *k_ptr;
+    BaseitemInfo *k_ptr;
     k_ptr = &baseitems_info[o_ptr->k_idx];
     DEPTH lev = baseitems_info[o_ptr->k_idx].level;
 

diff --git a/src/system/baseitem-info-definition.cpp b/src/system/baseitem-info-definition.cpp
index 2a6e1cd..b51c571 100644 (file)
--- a/src/system/baseitem-info-definition.cpp
+++ b/src/system/baseitem-info-definition.cpp
@@ -45,4 +45,4 @@ std::optional<int> BaseitemKey::sval() const
     return this->subtype_value;
 }
 
-std::vector<BaseItemInfo> baseitems_info;
+std::vector<BaseitemInfo> baseitems_info;

diff --git a/src/system/baseitem-info-definition.h b/src/system/baseitem-info-definition.h
index bc69002..55baa4e 100644 (file)
--- a/src/system/baseitem-info-definition.h
+++ b/src/system/baseitem-info-definition.h
@@ -44,9 +44,9 @@ private:
 
 enum class ItemKindType : short;
 enum class RandomArtActType : short;
-class BaseItemInfo {
+class BaseitemInfo {
 public:
-    BaseItemInfo() = default;
+    BaseitemInfo() = default;
     KIND_OBJECT_IDX idx{};
 
     std::string name; /*!< ベースアイテム名 */
@@ -90,4 +90,4 @@ public:
     bool tried{}; /*!< ベースアイテムを未鑑定のまま試したことがあるか /  The player has "tried" one of the items */
 };
 
-extern std::vector<BaseItemInfo> baseitems_info;
+extern std::vector<BaseitemInfo> baseitems_info;

diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index 2dcf9c6..828cfea 100644 (file)
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -254,7 +254,7 @@ static void prt_alloc(ItemKindType tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row
     int home = 0;
     for (int i = 0; i < K_MAX_DEPTH; i++) {
         int total_frac = 0;
-        BaseItemInfo *k_ptr;
+        BaseitemInfo *k_ptr;
         for (const auto &entry : alloc_kind_table) {
             PERCENTAGE prob = 0;