[Refactor] #40533 Moved battle_mon[] from cmd-building.c/h to building-type-definition.h

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 1f37b38..8225e31 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -68,7 +68,6 @@
 #include "view/display-messages.h"
 #include "world/world.h"
 
-MONRACE_IDX battle_mon[4];
 u32b mon_odds[4];
 int battle_odds;
 PRICE kakekin;

diff --git a/src/cmd-building/cmd-building.h b/src/cmd-building/cmd-building.h
index 48b4d63..6e95a5c 100644 (file)
--- a/src/cmd-building/cmd-building.h
+++ b/src/cmd-building/cmd-building.h
@@ -15,7 +15,6 @@
 extern bool reinit_wilderness;
 extern MONRACE_IDX today_mon;
 
-extern MONRACE_IDX battle_mon[4];
 extern u32b mon_odds[4];
 extern int battle_odds;
 extern PRICE kakekin;

diff --git a/src/load/world-loader.c b/src/load/world-loader.c
index 4ad7d67..f3e8ba4 100644 (file)
--- a/src/load/world-loader.c
+++ b/src/load/world-loader.c
@@ -6,6 +6,7 @@
 #include "load/load-util.h"
 #include "load/load-zangband.h"
 #include "market/bounty.h"
+#include "system/building-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "world/world.h"
 

diff --git a/src/save/player-writer.c b/src/save/player-writer.c
index d6ed3d0..d672bee 100644 (file)
--- a/src/save/player-writer.c
+++ b/src/save/player-writer.c
@@ -4,6 +4,7 @@
 #include "game-option/birth-options.h"
 #include "save/info-writer.h"
 #include "save/save-util.h"
+#include "system/building-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "world/world.h"
 

diff --git a/src/system/building-type-definition.c b/src/system/building-type-definition.c
index e07d149..9266e9b 100644 (file)
--- a/src/system/building-type-definition.c
+++ b/src/system/building-type-definition.c
@@ -1,3 +1,4 @@
 #include "system/building-type-definition.h"
 
 building_type building[MAX_BLDG];
+MONRACE_IDX battle_mon[4];

diff --git a/src/system/building-type-definition.h b/src/system/building-type-definition.h
index 2995dbd..7027612 100644 (file)
--- a/src/system/building-type-definition.h
+++ b/src/system/building-type-definition.h
@@ -36,3 +36,4 @@ typedef struct building_type {
 } building_type;
 
 extern building_type building[MAX_BLDG];
+extern MONRACE_IDX battle_mon[4];