From 1b31f2e4f607d250f1ff3f46cb6bf12c3a8f68bc Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 21 Aug 2020 18:47:01 +0900 Subject: [PATCH] [Refactor] #40533 Moved battle_mon[] from cmd-building.c/h to building-type-definition.h --- src/cmd-building/cmd-building.c | 1 - src/cmd-building/cmd-building.h | 1 - src/load/world-loader.c | 1 + src/save/player-writer.c | 1 + src/system/building-type-definition.c | 1 + src/system/building-type-definition.h | 1 + 6 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c index 1f37b38d0..8225e31da 100644 --- 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 48b4d636c..6e95a5c74 100644 --- 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 4ad7d674a..f3e8ba4e0 100644 --- 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 d6ed3d052..d672beedf 100644 --- 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 e07d14901..9266e9b0f 100644 --- 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 2995dbd05..702761250 100644 --- 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]; -- 2.11.0