[Refactor] #4503 lore_type::reinforce をlore_type::has_reinforce に改名した

diff --git a/src/lore/lore-util.h b/src/lore/lore-util.h
index 1d7750b..e3eead2 100644 (file)
--- a/src/lore/lore-util.h
+++ b/src/lore/lore-util.h
@@ -47,7 +47,7 @@ struct lore_type {
     bool sin = false;
 #endif
 
-    bool reinforce = false;
+    bool has_reinforce = false;
     bool know_everything = false;
     bool old = false;
     int count = 0;

diff --git a/src/lore/monster-lore.cpp b/src/lore/monster-lore.cpp
index 7e23f20..35fa7eb 100644 (file)
--- a/src/lore/monster-lore.cpp
+++ b/src/lore/monster-lore.cpp
@@ -139,7 +139,7 @@ void process_monster_lore(PlayerType *player_ptr, MonsterRaceId r_idx, monster_l
     lore_type tmp_lore(r_idx, mode);
     lore_type *lore_ptr = &tmp_lore;
     const auto end = lore_ptr->r_ptr->reinforces.end();
-    lore_ptr->reinforce =
+    lore_ptr->has_reinforce =
         std::find_if(
             lore_ptr->r_ptr->reinforces.begin(), end,
             [](const auto &reinforce) { return reinforce.is_valid(); }) != end;

diff --git a/src/view/display-lore.cpp b/src/view/display-lore.cpp
index 8fc1cdd..c5acaff 100644 (file)
--- a/src/view/display-lore.cpp
+++ b/src/view/display-lore.cpp
@@ -521,7 +521,7 @@ void display_lore_this(PlayerType *player_ptr, lore_type *lore_ptr)
 
 static void display_monster_escort_contents(lore_type *lore_ptr)
 {
-    if (!lore_ptr->reinforce) {
+    if (!lore_ptr->has_reinforce) {
         return;
     }
 
@@ -540,8 +540,8 @@ static void display_monster_escort_contents(lore_type *lore_ptr)
     for (const auto &reinforce : lore_ptr->r_ptr->reinforces) {
 #ifdef JP
 #else
-        const char *prefix = (idx == 0) ? " " : (idx == max_idx) ? " and "
-                                                                 : ", ";
+        const std::string prefix = (idx == 0) ? " " : (idx == max_idx) ? " and "
+                                                                       : ", ";
         ++idx;
 #endif
         if (!reinforce.is_valid()) {
@@ -550,7 +550,7 @@ static void display_monster_escort_contents(lore_type *lore_ptr)
 
         const auto &monrace = reinforce.get_monrace();
         if (monrace.kind_flags.has(MonsterKindType::UNIQUE)) {
-            hooked_roff(format("%s%s", _("、", prefix), monrace.name.data()));
+            hooked_roff(format("%s%s", _("、", prefix.data()), monrace.name.data()));
             continue;
         }
 
@@ -559,7 +559,7 @@ static void display_monster_escort_contents(lore_type *lore_ptr)
 #else
         const auto is_plural = reinforce.roll_max_dice() > 1;
         const auto &name = is_plural ? pluralize(monrace.name) : monrace.name.string();
-        hooked_roff(format("%s%s %s", prefix, reinforce.get_dice_as_string().data(), name.data()));
+        hooked_roff(format("%s%s %s", prefix.data(), reinforce.get_dice_as_string().data(), name.data()));
 #endif
     }
 
@@ -568,7 +568,7 @@ static void display_monster_escort_contents(lore_type *lore_ptr)
 
 void display_monster_collective(lore_type *lore_ptr)
 {
-    if (lore_ptr->misc_flags.has(MonsterMiscType::ESCORT) || lore_ptr->misc_flags.has(MonsterMiscType::MORE_ESCORT) || lore_ptr->reinforce) {
+    if (lore_ptr->misc_flags.has(MonsterMiscType::ESCORT) || lore_ptr->misc_flags.has(MonsterMiscType::MORE_ESCORT) || lore_ptr->has_reinforce) {
         hooked_roff(format(_("%s^は通常護衛を伴って現れる。", "%s^ usually appears with escorts.  "), Who::who(lore_ptr->msex)));
         display_monster_escort_contents(lore_ptr);
     } else if (lore_ptr->misc_flags.has(MonsterMiscType::HAS_FRIENDS)) {