* @param o_ptr オブジェクト構造体の参照ポインタ
* @param resist_list 通常耐性構造体の参照ポインタ
*/
-static void analyze_resist(ItemEntity *o_ptr, concptr *resist_list)
+static std::vector<std::string> analyze_resist(ItemEntity *o_ptr)
{
auto flags = object_flags(o_ptr);
- resist_list = spoiler_flag_aux(flags, resist_flags_desc, resist_list, N_ELEMENTS(resist_flags_desc));
- *resist_list = nullptr;
+ return extract_spoiler_flags(flags, resist_flags_desc);
}
/*!
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);
+ desc_ptr->resistances = analyze_resist(o_ptr);
analyze_vulnerable(o_ptr, desc_ptr->vulnerables);
analyze_sustains(o_ptr, desc_ptr->sustains);
desc_ptr->misc_magic = analyze_misc_magic(o_ptr);
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);
+ desc_ptr->resistances = analyze_resist(o_ptr);
analyze_vulnerable(o_ptr, desc_ptr->vulnerables);
analyze_sustains(o_ptr, desc_ptr->sustains);
desc_ptr->misc_magic = analyze_misc_magic(o_ptr);
{ TR_IMPACT, _("強撃", "Smash hit") },
};
-const flag_desc resist_flags_desc[MAX_RESISTANCE_FLAGS_DESCRIPTION] = {
+const std::vector<flag_desc> resist_flags_desc = {
{ TR_RES_ACID, _("酸", "Acid") },
{ TR_RES_ELEC, _("電撃", "Lightning") },
{ TR_RES_FIRE, _("火炎", "Fire") },
#include "system/angband.h"
#include <vector>
-#define MAX_RESISTANCE_FLAGS_DESCRIPTION 19
#define MAX_VULNERABLE_FLAGS_DESCRIPTION 6
#define MAX_IMMUNITY_FLAGS_DESCRIPTION 4
#define MAX_SUSTAINER_FLAGS_DESCRIPTION 6
extern const std::vector<flag_desc> pval_flags1_desc;
extern const std::vector<flag_desc> slay_flags_desc;
extern const std::vector<flag_desc> brand_flags_desc;
-extern const flag_desc resist_flags_desc[MAX_RESISTANCE_FLAGS_DESCRIPTION];
+extern const std::vector<flag_desc> resist_flags_desc;
extern const flag_desc vulnerable_flags_desc[MAX_VULNERABLE_FLAGS_DESCRIPTION];
extern const flag_desc immune_flags_desc[MAX_IMMUNITY_FLAGS_DESCRIPTION];
extern const flag_desc sustain_flags_desc[MAX_SUSTAINER_FLAGS_DESCRIPTION];
std::vector<std::string> slays{}; /* A list of an object's slaying preferences */
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 */
+ std::vector<std::string> resistances{}; /* A list of resistances granted by an object */
concptr vulnerables[N_ELEMENTS(vulnerable_flags_desc) + 1]{}; /* A list of resistances granted by an object */
concptr sustains[N_ELEMENTS(sustain_flags_desc) - 1 + 1]{}; /* A list of stats sustained by an object */
std::vector<std::string> misc_magic{}; // その他の特性 (呪い、光源範囲等)