[Refactor] #37353 NO_TOWN, SECRET_TOWN を wild.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 03aaac0..5e3b13b 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -288,17 +288,9 @@
 
 #define GINOU_MAX      10
 
-#define NO_TOWN 6
-#define SECRET_TOWN 5
-
 
 #define MAX_MANE 16
-#define MAX_MONSPELLS 96
-#define MONSPELL_TYPE_BOLT 1
-#define MONSPELL_TYPE_BALL 2
-#define MONSPELL_TYPE_BREATH 3
-#define MONSPELL_TYPE_SUMMON 4
-#define MONSPELL_TYPE_OTHER 5
+
 
 #define EATER_EXT 36
 #define EATER_CHARGE 0x10000L

diff --git a/src/monster-spell.h b/src/monster-spell.h
index 4d9580c..de95c04 100644 (file)
--- a/src/monster-spell.h
+++ b/src/monster-spell.h
@@ -14,6 +14,12 @@ struct monster_power
        concptr    name;
 };
 
+#define MAX_MONSPELLS 96
+#define MONSPELL_TYPE_BOLT 1
+#define MONSPELL_TYPE_BALL 2
+#define MONSPELL_TYPE_BREATH 3
+#define MONSPELL_TYPE_SUMMON 4
+#define MONSPELL_TYPE_OTHER 5
 
 /* Monster Spells */
 #define MS_SHRIEK         0

diff --git a/src/rooms-city.c b/src/rooms-city.c
index fb2f524..2e3dc4d 100644 (file)
--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -7,6 +7,7 @@
 #include "rooms.h"
 #include "rooms-city.h"
 #include "store.h"
+#include "wild.h"
 
 
 

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 081b0a6..b7cc252 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -12,6 +12,7 @@
 #include "floor.h"
 #include "dungeon.h"
 #include "geometry.h"
+#include "wild.h"
 
 /*
  * The vault generation arrays

diff --git a/src/rumor.c b/src/rumor.c
index 0271943..ce54604 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -7,6 +7,7 @@
 #include "dungeon.h"
 #include "monsterrace.h"
 #include "floor-town.h"
+#include "wild.h"
 
 /*
  * Display a rumor and apply its effects

diff --git a/src/store.c b/src/store.c
index 7a3cf4c..f26dd2c 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -43,6 +43,7 @@
 #include "floor-town.h"
 #include "japanese.h"
 #include "view-mainwindow.h"
+#include "wild.h"
 
 #define MIN_STOCK 12
 

diff --git a/src/wild.h b/src/wild.h
index 1a8429c..808ba94 100644 (file)
--- a/src/wild.h
+++ b/src/wild.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define NO_TOWN 6
+#define SECRET_TOWN 5
+
 /*
  * Wilderness terrains
  */