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 d1339cb..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"
@@ -66,13 +66,13 @@ static void dump_magic_eater(PlayerType *player_ptr, FILE *fff)
                 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);
         }
 
@@ -83,7 +83,7 @@ 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);
+            fputs(desc_list[i].data(), fff);
             if (i % 3 < 2) {
                 fputs("    ", fff);
             } else {