[Refactor] #40104 Changed definition name from MR1_SINKA to MR1_EVOLUTION

diff --git a/src/lore/lore-store.c b/src/lore/lore-store.c
index ac294d3..768c244 100644 (file)
--- a/src/lore/lore-store.c
+++ b/src/lore/lore-store.c
@@ -79,9 +79,9 @@ int lore_do_probe(player_type *player_ptr, MONRACE_IDX r_idx)
     r_ptr->r_flags6 = r_ptr->a_ability_flags2;
     r_ptr->r_flagsr = r_ptr->flagsr;
 
-    if (!(r_ptr->r_xtra1 & MR1_SINKA))
+    if (!(r_ptr->r_xtra1 & MR1_EVOLUTION))
         n++;
-    r_ptr->r_xtra1 |= MR1_SINKA;
+    r_ptr->r_xtra1 |= MR1_EVOLUTION;
 
     if (player_ptr->monster_race_idx == r_idx) {
         player_ptr->window |= (PW_MONSTER);

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index e9a0534..f51b4e9 100644 (file)
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -212,7 +212,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS
     lore_ptr->vn = 0;
     display_monster_concrete_resistances(lore_ptr);
     display_monster_resistances(lore_ptr);
-    if ((lore_ptr->r_ptr->r_xtra1 & MR1_SINKA) || lore_ptr->know_everything) {
+    if ((lore_ptr->r_ptr->r_xtra1 & MR1_EVOLUTION) || lore_ptr->know_everything) {
         if (lore_ptr->r_ptr->next_r_idx) {
             hooked_roff(format(_("%^sは経験を積むと、", "%^s will evolve into "), wd_he[lore_ptr->msex]));
             hook_c_roff(TERM_YELLOW, format("%s", r_name + r_info[lore_ptr->r_ptr->next_r_idx].name));

diff --git a/src/monster-race/monster-race.h b/src/monster-race/monster-race.h
index b336ce3..fb699ad 100644 (file)
--- a/src/monster-race/monster-race.h
+++ b/src/monster-race/monster-race.h
@@ -93,7 +93,7 @@ typedef struct monster_race {
        MONSTER_NUMBER r_tkills;        /* Count monsters killed in all lives */
        byte r_wake;                    /* Number of times woken up (?) */
        byte r_ignore;                  /* Number of times ignored (?) */
-       #define MR1_SINKA 0x01
+       #define MR1_EVOLUTION 0x01
        byte r_xtra1;                   /* Something */
        byte r_xtra2;                   /* Something (unused) */
        ITEM_NUMBER r_drop_gold;        /*!< これまでに撃破時に落とした財宝の数 / Max number of gold dropped at once */

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 14bc86e..06786f1 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -1027,7 +1027,7 @@ void monster_gain_exp(player_type *target_ptr, MONSTER_IDX m_idx, MONRACE_IDX s_
                        }
                }
 
-               if (!target_ptr->image) r_info[old_r_idx].r_xtra1 |= MR1_SINKA;
+               if (!target_ptr->image) r_info[old_r_idx].r_xtra1 |= MR1_EVOLUTION;
 
                /* Now you feel very close to this pet. */
                m_ptr->parent_m_idx = 0;