[Refactor] #3541 obj_desc_list::brands の型をconcptr[] からvector<string> に変えた

diff --git a/src/wizard/artifact-analyzer.cpp b/src/wizard/artifact-analyzer.cpp
index 0cc1332..005d85e 100644 (file)
--- a/src/wizard/artifact-analyzer.cpp
+++ b/src/wizard/artifact-analyzer.cpp
@@ -75,11 +75,10 @@ static std::vector<std::string> analyze_slay(ItemEntity *o_ptr)
  * @param o_ptr オブジェクト構造体の参照ポインタ
  * @param brand_list 属性ブランド構造体の参照ポインタ
  */
-static void analyze_brand(ItemEntity *o_ptr, concptr *brand_list)
+static std::vector<std::string> analyze_brand(ItemEntity *o_ptr)
 {
     auto flags = object_flags(o_ptr);
-    brand_list = spoiler_flag_aux(flags, brand_flags_desc, brand_list, N_ELEMENTS(brand_flags_desc));
-    *brand_list = nullptr;
+    return extract_spoiler_flags(flags, brand_flags_desc);
 }
 
 /*!
@@ -285,7 +284,7 @@ void object_analyze(PlayerType *player_ptr, ItemEntity *o_ptr, obj_desc_list *de
 {
     angband_strcpy(desc_ptr->description, analyze_general(player_ptr, o_ptr), MAX_NLEN);
     desc_ptr->pval_info.analyze(*o_ptr);
-    analyze_brand(o_ptr, desc_ptr->brands);
+    desc_ptr->brands = analyze_brand(o_ptr);
     desc_ptr->slays = analyze_slay(o_ptr);
     analyze_immune(o_ptr, desc_ptr->immunities);
     analyze_resist(o_ptr, desc_ptr->resistances);
@@ -307,7 +306,7 @@ void random_artifact_analyze(PlayerType *player_ptr, ItemEntity *o_ptr, obj_desc
 {
     angband_strcpy(desc_ptr->description, analyze_general(player_ptr, o_ptr), MAX_NLEN);
     desc_ptr->pval_info.analyze(*o_ptr);
-    analyze_brand(o_ptr, desc_ptr->brands);
+    desc_ptr->brands = analyze_brand(o_ptr);
     desc_ptr->slays = analyze_slay(o_ptr);
     analyze_immune(o_ptr, desc_ptr->immunities);
     analyze_resist(o_ptr, desc_ptr->resistances);

diff --git a/src/wizard/spoiler-table.cpp b/src/wizard/spoiler-table.cpp
index de02574..3828ae8 100644 (file)
--- a/src/wizard/spoiler-table.cpp
+++ b/src/wizard/spoiler-table.cpp
@@ -99,7 +99,7 @@ const std::vector<flag_desc> slay_flags_desc = {
 };
 
 /* Elemental brands for weapons */
-flag_desc brand_flags_desc[MAX_BRAND_FLAGS_DESCRIPTION] = {
+const std::vector<flag_desc> brand_flags_desc = {
     { TR_BRAND_ACID, _("溶解", "Acid Brand") },
     { TR_BRAND_ELEC, _("電撃", "Lightning Brand") },
     { TR_BRAND_FIRE, _("焼棄", "Flame Tongue") },

diff --git a/src/wizard/spoiler-table.h b/src/wizard/spoiler-table.h
index a4661c3..83a6e55 100644 (file)
--- a/src/wizard/spoiler-table.h
+++ b/src/wizard/spoiler-table.h
@@ -5,7 +5,6 @@
 #include "system/angband.h"
 #include <vector>
 
-#define MAX_BRAND_FLAGS_DESCRIPTION 12
 #define MAX_RESISTANCE_FLAGS_DESCRIPTION 19
 #define MAX_VULNERABLE_FLAGS_DESCRIPTION 6
 #define MAX_IMMUNITY_FLAGS_DESCRIPTION 4
@@ -33,7 +32,7 @@ extern const std::vector<grouper> group_artifact_list;
 extern const std::vector<flag_desc> stat_flags_desc;
 extern const std::vector<flag_desc> pval_flags1_desc;
 extern const std::vector<flag_desc> slay_flags_desc;
-extern flag_desc brand_flags_desc[MAX_BRAND_FLAGS_DESCRIPTION];
+extern const std::vector<flag_desc> brand_flags_desc;
 extern const flag_desc resist_flags_desc[MAX_RESISTANCE_FLAGS_DESCRIPTION];
 extern const flag_desc vulnerable_flags_desc[MAX_VULNERABLE_FLAGS_DESCRIPTION];
 extern const flag_desc immune_flags_desc[MAX_IMMUNITY_FLAGS_DESCRIPTION];

diff --git a/src/wizard/spoiler-util.h b/src/wizard/spoiler-util.h
index 1e570ca..8549ede 100644 (file)
--- a/src/wizard/spoiler-util.h
+++ b/src/wizard/spoiler-util.h
@@ -37,7 +37,7 @@ struct obj_desc_list {
     char description[MAX_NLEN]{}; /* "The Longsword Dragonsmiter (6d4) (+20, +25)" */
     ParameterValueInfo pval_info{}; /* Description of what is affected by an object's pval */
     std::vector<std::string> slays{}; /* A list of an object's slaying preferences */
-    concptr brands[N_ELEMENTS(brand_flags_desc) + 1]{}; /* A list if an object's elemental brands */
+    std::vector<std::string> brands{}; /* A list if an object's elemental brands */
     concptr immunities[N_ELEMENTS(immune_flags_desc) + 1]{}; /* A list of immunities granted by an object */
     concptr resistances[N_ELEMENTS(resist_flags_desc) + 1]{}; /* A list of resistances granted by an object */
     concptr vulnerables[N_ELEMENTS(vulnerable_flags_desc) + 1]{}; /* A list of resistances granted by an object */