From de8236ab7ef1ed03b5c4e4b35d5c67997544fafe Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 25 May 2019 19:05:58 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20TERRAIN=5F*=20=E5=AE=9A?= =?utf8?q?=E7=BE=A9=E3=82=92=20wild.h=E3=80=80=E3=81=B8=E7=A7=BB=E5=8B=95?= =?utf8?q?=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 20 -------------------- src/wild.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/defines.h b/src/defines.h index 229e820ef..84e8a529c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -434,26 +434,6 @@ */ #define MAX_FEAT_STATES 8 - -/* - * Wilderness terrains - */ -#define TERRAIN_EDGE 0 /* Edge of the World */ -#define TERRAIN_TOWN 1 /* Town */ -#define TERRAIN_DEEP_WATER 2 /* Deep water */ -#define TERRAIN_SHALLOW_WATER 3 /* Shallow water */ -#define TERRAIN_SWAMP 4 /* Swamp */ -#define TERRAIN_DIRT 5 /* Dirt */ -#define TERRAIN_GRASS 6 /* Grass */ -#define TERRAIN_TREES 7 /* Trees */ -#define TERRAIN_DESERT 8 /* Desert */ -#define TERRAIN_SHALLOW_LAVA 9 /* Shallow lava */ -#define TERRAIN_DEEP_LAVA 10 /* Deep lava */ -#define TERRAIN_MOUNTAIN 11 /* Mountain */ - -#define MAX_WILDERNESS 12 /* Maximum wilderness index */ - - /* * Feature flags - should be used instead of feature indexes unless generating. * Originally from UnAngband, and modified into TR-like style in Hengband diff --git a/src/wild.h b/src/wild.h index 4467abc24..1a8429c30 100644 --- a/src/wild.h +++ b/src/wild.h @@ -1,5 +1,24 @@ #pragma once +/* + * Wilderness terrains + */ +#define TERRAIN_EDGE 0 /* Edge of the World */ +#define TERRAIN_TOWN 1 /* Town */ +#define TERRAIN_DEEP_WATER 2 /* Deep water */ +#define TERRAIN_SHALLOW_WATER 3 /* Shallow water */ +#define TERRAIN_SWAMP 4 /* Swamp */ +#define TERRAIN_DIRT 5 /* Dirt */ +#define TERRAIN_GRASS 6 /* Grass */ +#define TERRAIN_TREES 7 /* Trees */ +#define TERRAIN_DESERT 8 /* Desert */ +#define TERRAIN_SHALLOW_LAVA 9 /* Shallow lava */ +#define TERRAIN_DEEP_LAVA 10 /* Deep lava */ +#define TERRAIN_MOUNTAIN 11 /* Mountain */ + +#define MAX_WILDERNESS 12 /* Maximum wilderness index */ + + /* wild.c */ extern void set_floor_and_wall(DUNGEON_IDX type); extern void wilderness_gen(void); -- 2.11.0