[Refactor] #37353 賭け闘技場に関する定義を bldg.c/h へ移動．

diff --git a/src/bldg.c b/src/bldg.c
index d97d71d..47eab3d 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -60,6 +60,11 @@
  */
 building_type building[MAX_BLDG];
 
+MONRACE_IDX battle_mon[4];
+u32b mon_odds[4];
+int battle_odds;
+PRICE kakekin;
+int sel_monster;
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル

diff --git a/src/bldg.h b/src/bldg.h
index 7735048..ad44305 100644 (file)
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -90,6 +90,12 @@ typedef struct
        OBJECT_SUBTYPE_VALUE sval;  /*!< モンスター打倒後に得られるアイテムの小カテゴリID / sval of prize */
 } arena_type;
 
+extern MONRACE_IDX battle_mon[4];
+extern u32b mon_odds[4];
+extern int battle_odds;
+extern PRICE kakekin;
+extern int sel_monster;
+
 extern const arena_type arena_info[MAX_ARENA_MONS + 2];
 extern void update_gambling_monsters(void);
 extern void do_cmd_bldg(void);

diff --git a/src/externs.h b/src/externs.h
index 7f8118a..78cb685 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -171,11 +171,7 @@ extern DUNGEON_IDX max_d_idx;
 extern int init_flags;
 extern int highscore_fd;
 extern bool can_save;
-extern MONRACE_IDX battle_mon[4];
-extern int sel_monster;
-extern int battle_odds;
-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 today_mon;

diff --git a/src/save.c b/src/save.c
index 65c34fb..cb28754 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -30,6 +30,7 @@
 #include "objectkind.h"
 #include "monsterrace.h"
 #include "birth.h"
+#include "bldg.h"
 
 
 /*

diff --git a/src/variable.c b/src/variable.c
index bd97dfb..1599975 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -394,11 +394,6 @@ int highscore_fd = -1;
 
 bool can_save = FALSE;        /* Game can be saved */
 
-MONRACE_IDX battle_mon[4];
-int sel_monster;
-int battle_odds;
-PRICE kakekin;
-u32b mon_odds[4];
 
 MONSTER_IDX pet_t_m_idx;
 MONSTER_IDX riding_t_m_idx;