Merge pull request #1122 from habu1010/feature/fix-parse-m-info-spell-xtra

[Fix] m_info.txt の xtra フラグが正しく読めていない

diff --git a/src/info-reader/info-reader-util.h b/src/info-reader/info-reader-util.h
index 7f2a282..5f24971 100644 (file)
--- a/src/info-reader/info-reader-util.h
+++ b/src/info-reader/info-reader-util.h
@@ -56,7 +56,7 @@ bool info_grab_one_flag(u32b *flags, const std::unordered_map<sview, T> &names,
  * @val 値
  */
 template <typename T>
-void info_set_value(T &arg, const std::string &val)
+void info_set_value(T &arg, const std::string &val, int base = 10)
 {
-    arg = static_cast<T>(std::stoi(val));
+    arg = static_cast<T>(std::stoi(val, nullptr, base));
 }

diff --git a/src/info-reader/magic-reader.cpp b/src/info-reader/magic-reader.cpp
index a8d7d76..b926c7c 100644 (file)
--- a/src/info-reader/magic-reader.cpp
+++ b/src/info-reader/magic-reader.cpp
@@ -75,7 +75,7 @@ errr parse_m_info(std::string_view buf, angband_header *head)
 
         m_ptr->spell_stat = stat->second;
 
-        info_set_value(m_ptr->spell_xtra, tokens[3]);
+        info_set_value(m_ptr->spell_xtra, tokens[3], 16);
         info_set_value(m_ptr->spell_type, tokens[4]);
         info_set_value(m_ptr->spell_first, tokens[5]);
         info_set_value(m_ptr->spell_weight, tokens[6]);