[Refactor] #38995 world_type 構造体に kubi_r_idx を bounty_r_idx に改名して取り込む。 / Move kubi_r...

diff --git a/src/bldg.c b/src/bldg.c
index 7c7f30d..b6688dd 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1637,9 +1637,9 @@ static void shoukinkubi(void)
        {
                byte color;
                concptr done_mark;
-               monster_race *r_ptr = &r_info[(kubi_r_idx[i] > 10000 ? kubi_r_idx[i] - 10000 : kubi_r_idx[i])];
+               monster_race *r_ptr = &r_info[(current_world_ptr->bounty_r_idx[i] > 10000 ? current_world_ptr->bounty_r_idx[i] - 10000 : current_world_ptr->bounty_r_idx[i])];
 
-               if (kubi_r_idx[i] > 10000)
+               if (current_world_ptr->bounty_r_idx[i] > 10000)
                {
                        color = TERM_RED;
                        done_mark = _("(済)", "(done)");
@@ -1829,7 +1829,7 @@ static bool kankin(void)
                for (i = INVEN_PACK-1; i >= 0; i--)
                {
                        o_ptr = &inventory[i];
-                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval == kubi_r_idx[j]))
+                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval == current_world_ptr->bounty_r_idx[j]))
                        {
                                char buf[MAX_NLEN+20];
                                int num, k;
@@ -1841,14 +1841,14 @@ static bool kankin(void)
                                if (!get_check(buf)) continue;
 
 #if 0 /* Obsoleted */
-                               msg_format(_("賞金 %ld＄を手に入れた。", "You get %ldgp."), (r_info[kubi_r_idx[j]].level + 1) * 300 * o_ptr->number);
-                               p_ptr->au += (r_info[kubi_r_idx[j]].level+1) * 300 * o_ptr->number;
+                               msg_format(_("賞金 %ld＄を手に入れた。", "You get %ldgp."), (r_info[current_world_ptr->bounty_r_idx[j]].level + 1) * 300 * o_ptr->number);
+                               p_ptr->au += (r_info[current_world_ptr->bounty_r_idx[j]].level+1) * 300 * o_ptr->number;
                                p_ptr->redraw |= (PR_GOLD);
                                inven_item_increase(i, -o_ptr->number);
                                inven_item_describe(i);
                                inven_item_optimize(i);
                                chg_virtue(V_JUSTICE, 5);
-                               kubi_r_idx[j] += 10000;
+                               current_world_ptr->bounty_r_idx[j] += 10000;
 
                                change = TRUE;
 #endif /* Obsoleted */
@@ -1859,12 +1859,12 @@ static bool kankin(void)
                                inven_item_optimize(i);
 
                                chg_virtue(V_JUSTICE, 5);
-                               kubi_r_idx[j] += 10000;
+                               current_world_ptr->bounty_r_idx[j] += 10000;
 
                                /* Count number of unique corpses already handed */
                                for (num = 0, k = 0; k < MAX_KUBI; k++)
                                {
-                                       if (kubi_r_idx[k] >= 10000) num++;
+                                       if (current_world_ptr->bounty_r_idx[k] >= 10000) num++;
                                }
                                msg_format(_("これで合計 %d ポイント獲得しました。" ,"You earned %d point%s total."), num, (num > 1 ? "s" : ""));
 

diff --git a/src/cmd4.c b/src/cmd4.c
index 4f58a5f..061cf49 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -4181,7 +4181,7 @@ static IDX collect_monsters(IDX grp_cur, IDX mon_idx[], BIT_FLAGS8 mode)
                        int j;
                        for (j = 0; j < MAX_KUBI; j++)
                        {
-                               if (kubi_r_idx[j] == i || kubi_r_idx[j] - 10000 == i ||
+                               if (current_world_ptr->bounty_r_idx[j] == i || current_world_ptr->bounty_r_idx[j] - 10000 == i ||
                                        (p_ptr->today_mon && p_ptr->today_mon == i))
                                {
                                        wanted = TRUE;
@@ -7535,9 +7535,9 @@ static void do_cmd_knowledge_kubi(void)
 
                for (i = 0; i < MAX_KUBI; i++)
                {
-                       if (kubi_r_idx[i] <= 10000)
+                       if (current_world_ptr->bounty_r_idx[i] <= 10000)
                        {
-                               fprintf(fff,"%s\n", r_name + r_info[kubi_r_idx[i]].name);
+                               fprintf(fff,"%s\n", r_name + r_info[current_world_ptr->bounty_r_idx[i]].name);
 
                                listed = TRUE;
                        }

diff --git a/src/dungeon.c b/src/dungeon.c
index b76a645..b890d2b 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -5651,8 +5651,8 @@ void determine_bounty_uniques(void)
        {
                while (1)
                {
-                       kubi_r_idx[i] = get_mon_num(MAX_DEPTH - 1);
-                       r_ptr = &r_info[kubi_r_idx[i]];
+                       current_world_ptr->bounty_r_idx[i] = get_mon_num(MAX_DEPTH - 1);
+                       r_ptr = &r_info[current_world_ptr->bounty_r_idx[i]];
 
                        if (!(r_ptr->flags1 & RF1_UNIQUE)) continue;
 
@@ -5660,10 +5660,10 @@ void determine_bounty_uniques(void)
 
                        if (r_ptr->rarity > 100) continue;
 
-                       if (no_questor_or_bounty_uniques(kubi_r_idx[i])) continue;
+                       if (no_questor_or_bounty_uniques(current_world_ptr->bounty_r_idx[i])) continue;
 
                        for (j = 0; j < i; j++)
-                               if (kubi_r_idx[i] == kubi_r_idx[j]) break;
+                               if (current_world_ptr->bounty_r_idx[i] == current_world_ptr->bounty_r_idx[j]) break;
 
                        if (j == i) break;
                }
@@ -5674,11 +5674,11 @@ void determine_bounty_uniques(void)
        {
                for (j = i; j < MAX_KUBI; j++)
                {
-                       if (r_info[kubi_r_idx[i]].level > r_info[kubi_r_idx[j]].level)
+                       if (r_info[current_world_ptr->bounty_r_idx[i]].level > r_info[current_world_ptr->bounty_r_idx[j]].level)
                        {
-                               tmp = kubi_r_idx[i];
-                               kubi_r_idx[i] = kubi_r_idx[j];
-                               kubi_r_idx[j] = tmp;
+                               tmp = current_world_ptr->bounty_r_idx[i];
+                               current_world_ptr->bounty_r_idx[i] = current_world_ptr->bounty_r_idx[j];
+                               current_world_ptr->bounty_r_idx[j] = tmp;
                        }
                }
        }

diff --git a/src/externs.h b/src/externs.h
index bc1eeff..3847051 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -339,7 +339,6 @@ extern PRICE kakekin;
 extern u32b mon_odds[4];
 extern MONSTER_IDX pet_t_m_idx;
 extern MONSTER_IDX riding_t_m_idx;
-extern MONRACE_IDX kubi_r_idx[MAX_KUBI];
 extern MONRACE_IDX today_mon;
 extern bool write_level;
 extern u32b playtime;

diff --git a/src/load.c b/src/load.c
index 0ef1096..8a62a18 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1899,14 +1899,14 @@ static void rd_extra(void)
                for (i = 0; i < MAX_KUBI; i++)
                {
                        /* Is this bounty unique already dead? */
-                       if (!r_info[kubi_r_idx[i]].max_num) kubi_r_idx[i] += 10000;
+                       if (!r_info[current_world_ptr->bounty_r_idx[i]].max_num) current_world_ptr->bounty_r_idx[i] += 10000;
                }
        }
        else
        {
                for (i = 0; i < MAX_KUBI; i++)
                {
-                       rd_s16b(&kubi_r_idx[i]);
+                       rd_s16b(&current_world_ptr->bounty_r_idx[i]);
                }
        }
 

diff --git a/src/monster-status.c b/src/monster-status.c
index 3c0429f..3cd495f 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1301,7 +1301,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note)
                {
                        for (i = 0; i < MAX_KUBI; i++)
                        {
-                               if ((kubi_r_idx[i] == m_ptr->r_idx) && !(m_ptr->mflag2 & MFLAG2_CHAMELEON))
+                               if ((current_world_ptr->bounty_r_idx[i] == m_ptr->r_idx) && !(m_ptr->mflag2 & MFLAG2_CHAMELEON))
                                {
                                        msg_format(_("%sの首には賞金がかかっている。", "There is a price on %s's head."), m_name);
                                        break;

diff --git a/src/object-hook.c b/src/object-hook.c
index 5f451a4..7e6cfec 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -546,7 +546,7 @@ bool object_is_shoukinkubi(object_type *o_ptr)
 
        /* Unique monster */
        for (i = 0; i < MAX_KUBI; i++)
-               if (o_ptr->pval == kubi_r_idx[i]) break;
+               if (o_ptr->pval == current_world_ptr->bounty_r_idx[i]) break;
        if (i < MAX_KUBI) return TRUE;
 
        /* Not wanted */

diff --git a/src/save.c b/src/save.c
index 09e9cb4..34be718 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -664,7 +664,7 @@ static void wr_extra(void)
 
        for (i = 0; i < MAX_KUBI; i++)
        {
-               wr_s16b(kubi_r_idx[i]);
+               wr_s16b(current_world_ptr->bounty_r_idx[i]);
        }
 
        for (i = 0; i < 4; i++)

diff --git a/src/types.h b/src/types.h
index 8abebc2..4d85d1c 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1927,4 +1927,6 @@ typedef struct {
        GAME_TURN dungeon_turn_limit;   /*!< dungeon_turnの最大値 / Limit of game_turn in dungeon */
        MONSTER_IDX timewalk_m_idx;     /*!< 現在時間停止を行っているモンスターのID */
 
+       MONRACE_IDX bounty_r_idx[MAX_KUBI];
+
 } world_type;

diff --git a/src/variable.c b/src/variable.c
index ddf3a75..4a2f382 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -788,7 +788,6 @@ u32b mon_odds[4];
 MONSTER_IDX pet_t_m_idx;
 MONSTER_IDX riding_t_m_idx;
 
-MONSTER_IDX kubi_r_idx[MAX_KUBI];
 MONSTER_IDX today_mon;
 
 bool write_level;

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 823b540..9328563 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -1652,7 +1652,7 @@ static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type* m_ptr, int
        if(r_ptr->flags1&RF1_UNIQUE){//unique
                bool is_kubi = FALSE;
                for(i=0;i<MAX_KUBI;i++){
-                       if(kubi_r_idx[i] == r_idx){
+                       if(current_world_ptr->bounty_r_idx[i] == r_idx){
                                is_kubi = TRUE;
                                break;
                        }