Merge pull request #3561 from Hourier/Change-Signature-Terms

[hengbandforosx/hengbandosx.git] / src / io-dump / special-class-dump.cpp

diff --git a/src/io-dump/special-class-dump.cpp b/src/io-dump/special-class-dump.cpp
index 2deff57..69463b4 100644 (file)
--- a/src/io-dump/special-class-dump.cpp
+++ b/src/io-dump/special-class-dump.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @brief 一部職業でのみダンプする能力の出力処理
  * @date 2020/03/07
  * @author Hourier
@@ -11,11 +11,11 @@
 #include "monster-race/race-ability-flags.h"
 #include "mspell/monster-power-table.h"
 #include "object/object-kind-hook.h"
-#include "object/object-kind.h"
 #include "player-base/player-class.h"
 #include "player-info/bluemage-data-type.h"
 #include "player-info/magic-eater-data-type.h"
 #include "smith/object-smith.h"
+#include "system/baseitem-info.h"
 #include "system/player-type-definition.h"
 #include "util/enum-converter.h"
 #include "util/flag-group.h"
@@ -25,9 +25,9 @@
 #include <string>
 #include <vector>
 
-typedef struct {
+struct learnt_spell_table {
     EnumClassFlagGroup<MonsterAbilityType> ability_flags;
-} learnt_spell_table;
+};
 
 /*!
  * @brief 魔力喰いを持つクラスの情報をダンプする
@@ -62,15 +62,17 @@ static void dump_magic_eater(PlayerType *player_ptr, FILE *fff)
         std::vector<std::string> desc_list;
         for (auto i = 0U; i < item_group.size(); ++i) {
             auto &item = item_group[i];
-            if (item.count == 0)
+            if (item.count == 0) {
                 continue;
+            }
 
-            KIND_OBJECT_IDX k_idx = lookup_kind(tval, i);
-            if (!k_idx)
+            auto bi_id = lookup_baseitem_id({ tval, i });
+            if (!bi_id) {
                 continue;
+            }
 
             char buf[128];
-            snprintf(buf, sizeof(buf), "%23s (%2d)", k_info[k_idx].name.c_str(), item.count);
+            snprintf(buf, sizeof(buf), "%23s (%2d)", baseitems_info[bi_id].name.data(), item.count);
             desc_list.emplace_back(buf);
         }
 
@@ -81,15 +83,17 @@ static void dump_magic_eater(PlayerType *player_ptr, FILE *fff)
 
         uint i;
         for (i = 0; i < desc_list.size(); i++) {
-            fputs(desc_list[i].c_str(), fff);
-            if (i % 3 < 2)
+            fputs(desc_list[i].data(), fff);
+            if (i % 3 < 2) {
                 fputs("    ", fff);
-            else
+            } else {
                 fputs("\n", fff);
+            }
         }
 
-        if (i % 3 > 0)
+        if (i % 3 > 0) {
             fputs("\n", fff);
+        }
     }
 }
 
@@ -113,10 +117,12 @@ static void dump_smith(PlayerType *player_ptr, FILE *fff)
     for (auto i = 0U; i < row; i++) {
         fprintf(fff, "\n");
         fprintf(fff, "%-11s %5d     ", Smith::get_essence_name(essences[i]), amounts[i]);
-        if (i + row < n)
+        if (i + row < n) {
             fprintf(fff, "%-11s %5d     ", Smith::get_essence_name(essences[i + row]), amounts[i + row]);
-        if (i + row * 2 < n)
+        }
+        if (i + row * 2 < n) {
             fprintf(fff, "%-11s %5d", Smith::get_essence_name(essences[i + row * 2]), amounts[i + row * 2]);
+        }
     }
 
     fputs("\n", fff);