[Refactor] #37353 determine_bounty_uniques() を bldg.c/h へ移動。

diff --git a/src/bldg.c b/src/bldg.c
index 3f0001f..eae5a5c 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4245,3 +4245,52 @@ void determine_today_mon(bool conv_old)
        p_ptr->inside_battle = old_inside_battle;
 }
 
+
+
+/*!
+ * @brief 賞金首となるユニークを確定する / Determine bounty uniques
+ * @return なし
+ */
+void determine_bounty_uniques(void)
+{
+       int i, j;
+       MONRACE_IDX tmp;
+       monster_race *r_ptr;
+
+       get_mon_num_prep(NULL, NULL);
+       for (i = 0; i < MAX_KUBI; i++)
+       {
+               while (1)
+               {
+                       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;
+
+                       if (!(r_ptr->flags9 & (RF9_DROP_CORPSE | RF9_DROP_SKELETON))) continue;
+
+                       if (r_ptr->rarity > 100) continue;
+
+                       if (no_questor_or_bounty_uniques(current_world_ptr->bounty_r_idx[i])) continue;
+
+                       for (j = 0; j < i; j++)
+                               if (current_world_ptr->bounty_r_idx[i] == current_world_ptr->bounty_r_idx[j]) break;
+
+                       if (j == i) break;
+               }
+       }
+
+       /* Sort them */
+       for (i = 0; i < MAX_KUBI - 1; i++)
+       {
+               for (j = i; j < MAX_KUBI; j++)
+               {
+                       if (r_info[current_world_ptr->bounty_r_idx[i]].level > r_info[current_world_ptr->bounty_r_idx[j]].level)
+                       {
+                               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/bldg.h b/src/bldg.h
index 02bd15d..7735048 100644 (file)
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -96,3 +96,4 @@ extern void do_cmd_bldg(void);
 
 extern void clear_bldg(int min_row, int max_row);
 extern void determine_today_mon(bool conv_old);
+extern void determine_bounty_uniques(void);

diff --git a/src/core.c b/src/core.c
index 4c4ae89..5900b45 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5273,55 +5273,6 @@ void extract_option_vars(void)
        }
 }
 
-
-/*!
- * @brief 賞金首となるユニークを確定する / Determine bounty uniques
- * @return なし
- */
-void determine_bounty_uniques(void)
-{
-       int i, j;
-       MONRACE_IDX tmp;
-       monster_race *r_ptr;
-
-       get_mon_num_prep(NULL, NULL);
-       for (i = 0; i < MAX_KUBI; i++)
-       {
-               while (1)
-               {
-                       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;
-
-                       if (!(r_ptr->flags9 & (RF9_DROP_CORPSE | RF9_DROP_SKELETON))) continue;
-
-                       if (r_ptr->rarity > 100) continue;
-
-                       if (no_questor_or_bounty_uniques(current_world_ptr->bounty_r_idx[i])) continue;
-
-                       for (j = 0; j < i; j++)
-                               if (current_world_ptr->bounty_r_idx[i] == current_world_ptr->bounty_r_idx[j]) break;
-
-                       if (j == i) break;
-               }
-       }
-
-       /* Sort them */
-       for (i = 0; i < MAX_KUBI - 1; i++)
-       {
-               for (j = i; j < MAX_KUBI; j++)
-               {
-                       if (r_info[current_world_ptr->bounty_r_idx[i]].level > r_info[current_world_ptr->bounty_r_idx[j]].level)
-                       {
-                               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;
-                       }
-               }
-       }
-}
-
 /*!
  * @brief 1ゲームプレイの主要ルーチン / Actually play a game
  * @return なし

diff --git a/src/externs.h b/src/externs.h
index 2335b44..8646687 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -381,7 +381,6 @@ extern void do_cmd_suicide(void);
 
 /* dungeon.c */
 extern void extract_option_vars(void);
-extern void determine_bounty_uniques(void);
 extern void play_game(bool new_game);
 extern s32b turn_real(s32b hoge);
 extern void prevent_turn_overflow(void);