From 813b216f8ae26cc88d3aa7f50bd85e3c051e3964 Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 24 Jul 2020 10:23:07 +0900 Subject: [PATCH] [Refactor] #40570 Separated lake-types.h and room-types.h from rooms.c/h --- Hengband/Hengband/Hengband.vcxproj | 2 ++ Hengband/Hengband/Hengband.vcxproj.filters | 6 ++++++ src/Makefile.am | 4 +++- src/floor/floor-generate.c | 1 + src/floor/floor-streams.c | 1 + src/room/lake-types.h | 12 ++++++++++++ src/room/room-types.h | 23 +++++++++++++++++++++++ src/room/rooms-vault.c | 1 + src/room/rooms.c | 1 + src/room/rooms.h | 30 +----------------------------- 10 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 src/room/lake-types.h create mode 100644 src/room/room-types.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 5fecf2ea8..1c206e847 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -871,6 +871,8 @@ + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 36f8c0203..5d4b0b4b8 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -4081,6 +4081,12 @@ player + + room + + + room + diff --git a/src/Makefile.am b/src/Makefile.am index 4e4eff451..88d98565c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -602,7 +602,9 @@ hengband_SOURCES = \ realm/realm-trump.c realm/realm-trump.h \ realm/realm-types.h \ \ - room/rooms.c room/rooms.h room/rooms-city.c room/rooms-city.h \ + room/lake-types.h room/room-types.h \ + room/rooms.c room/rooms.h \ + room/rooms-city.c room/rooms-city.h \ room/rooms-fractal.c room/rooms-fractal.h \ room/rooms-normal.c room/rooms-normal.h \ room/rooms-special.c room/rooms-special.h \ diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c index ccf002d7d..390947a9e 100644 --- a/src/floor/floor-generate.c +++ b/src/floor/floor-generate.c @@ -46,6 +46,7 @@ #include "monster/monster-info.h" #include "monster-floor/place-monster-types.h" #include "player/player-status.h" +#include "room/lake-types.h" #include "room/rooms.h" #include "system/floor-type-definition.h" #include "system/system-variables.h" diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c index c126a73e4..783d51636 100644 --- a/src/floor/floor-streams.c +++ b/src/floor/floor-streams.c @@ -30,6 +30,7 @@ #include "monster-race/monster-race.h" #include "monster/monster-info.h" #include "object-hook/hook-enchant.h" +#include "room/lake-types.h" #include "room/rooms.h" #include "spell-kind/spells-floor.h" #include "system/artifact-type-definition.h" diff --git a/src/room/lake-types.h b/src/room/lake-types.h new file mode 100644 index 000000000..f9b512739 --- /dev/null +++ b/src/room/lake-types.h @@ -0,0 +1,12 @@ +#pragma once + +/* 池型地形の生成ID / Room types for generate_lake() */ +typedef enum lake_type { + LAKE_T_LAVA = 1, /*!< 池型地形ID: 溶岩 */ + LAKE_T_WATER = 2, /*!< 池型地形ID: 池 */ + LAKE_T_CAVE = 3, /*!< 池型地形ID: 空洞 */ + LAKE_T_EARTH_VAULT = 4, /*!< 池型地形ID: 地属性VAULT */ + LAKE_T_AIR_VAULT = 5, /*!< 池型地形ID: 風属性VAULT */ + LAKE_T_WATER_VAULT = 6, /*!< 池型地形ID: 水属性VAULT */ + LAKE_T_FIRE_VAULT = 7, /*!< 池型地形ID: 火属性VAULT */ +} lake_type; diff --git a/src/room/room-types.h b/src/room/room-types.h new file mode 100644 index 000000000..d29f3a9fd --- /dev/null +++ b/src/room/room-types.h @@ -0,0 +1,23 @@ +#pragma once + +/* 部屋型ID / Room types for room_build() */ +typedef enum room_type { + ROOM_T_NORMAL = 0, /*!<部屋型ID:基本長方形 / Simple (33x11) */ + ROOM_T_OVERLAP = 1, /*!<部屋型ID:長方形二つ重ね / Overlapping (33x11) */ + ROOM_T_CROSS = 2, /*!<部屋型ID:十字 / Crossed (33x11) */ + ROOM_T_INNER_FEAT = 3, /*!<部屋型ID:二重壁 / Large (33x11) */ + ROOM_T_NEST = 4, /*!<部屋型ID:モンスターNEST / Monster nest (33x11) */ + ROOM_T_PIT = 5, /*!<部屋型ID:モンスターPIT / Monster pit (33x11) */ + ROOM_T_LESSER_VAULT = 6, /*!<部屋型ID:小型VAULT / Lesser vault (33x22) */ + ROOM_T_GREATER_VAULT = 7, /*!<部屋型ID:大型VAULT / Greater vault (66x44) */ + ROOM_T_FRACAVE = 8, /*!<部屋型ID:フラクタル地形 / Fractal room (42x24) */ + ROOM_T_RANDOM_VAULT = 9, /*!<部屋型ID:ランダムVAULT / Random vault (44x22) */ + ROOM_T_OVAL = 10, /*!<部屋型ID:円形部屋 / Circular rooms (22x22) */ + ROOM_T_CRYPT = 11, /*!<部屋型ID:聖堂 / Crypts (22x22) */ + ROOM_T_TRAP_PIT = 12, /*!<部屋型ID:トラップつきモンスターPIT / Trapped monster pit */ + ROOM_T_TRAP = 13, /*!<部屋型ID:トラップ部屋 / Piranha/Armageddon trap room */ + ROOM_T_GLASS = 14, /*!<部屋型ID:ガラス部屋 / Glass room */ + ROOM_T_ARCADE = 15, /*!<部屋型ID:商店 / Arcade */ + ROOM_T_FIXED = 16, /*!<部屋型ID:固定部屋 / Fixed room */ + ROOM_T_MAX = 17, /*!<部屋型ID最大数 */ +} room_type; diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c index 30063889a..6214cf988 100644 --- a/src/room/rooms-vault.c +++ b/src/room/rooms-vault.c @@ -19,6 +19,7 @@ #include "monster-floor/monster-generator.h" #include "monster-floor/place-monster-types.h" #include "object-enchant/item-apply-magic.h" +#include "room/lake-types.h" #include "room/rooms.h" #include "store/store-util.h" #include "store/store.h" diff --git a/src/room/rooms.c b/src/room/rooms.c index 572aecfa9..459cf9b1c 100644 --- a/src/room/rooms.c +++ b/src/room/rooms.c @@ -49,6 +49,7 @@ #include "monster-floor/monster-generator.h" #include "monster-floor/place-monster-types.h" #include "object-enchant/item-apply-magic.h" +#include "room/lake-types.h" #include "room/rooms-city.h" #include "room/rooms-fractal.h" #include "room/rooms-normal.h" diff --git a/src/room/rooms.h b/src/room/rooms.h index cdc293c77..17d6ac342 100644 --- a/src/room/rooms.h +++ b/src/room/rooms.h @@ -1,38 +1,10 @@ #pragma once +#include "room/room-types.h" #include "system/angband.h" #define DUN_ROOMS_MAX 40 /*!< 部屋生成処理の最大試行数 / Number of rooms to attempt (was 50) */ -/* 池型地形の生成ID / Room types for generate_lake() */ -#define LAKE_T_LAVA 1 /*!< 池型地形ID: 溶岩 */ -#define LAKE_T_WATER 2 /*!< 池型地形ID: 池 */ -#define LAKE_T_CAVE 3 /*!< 池型地形ID: 空洞 */ -#define LAKE_T_EARTH_VAULT 4 /*!< 池型地形ID: 地属性VAULT */ -#define LAKE_T_AIR_VAULT 5 /*!< 池型地形ID: 風属性VAULT */ -#define LAKE_T_WATER_VAULT 6 /*!< 池型地形ID: 水属性VAULT */ -#define LAKE_T_FIRE_VAULT 7 /*!< 池型地形ID: 火属性VAULT */ - -/* 部屋型ID / Room types for room_build() */ -#define ROOM_T_NORMAL 0 /*!<部屋型ID:基本長方形 / Simple (33x11) */ -#define ROOM_T_OVERLAP 1 /*!<部屋型ID:長方形二つ重ね / Overlapping (33x11) */ -#define ROOM_T_CROSS 2 /*!<部屋型ID:十字 / Crossed (33x11) */ -#define ROOM_T_INNER_FEAT 3 /*!<部屋型ID:二重壁 / Large (33x11) */ -#define ROOM_T_NEST 4 /*!<部屋型ID:モンスターNEST / Monster nest (33x11) */ -#define ROOM_T_PIT 5 /*!<部屋型ID:モンスターPIT / Monster pit (33x11) */ -#define ROOM_T_LESSER_VAULT 6 /*!<部屋型ID:小型VAULT / Lesser vault (33x22) */ -#define ROOM_T_GREATER_VAULT 7 /*!<部屋型ID:大型VAULT / Greater vault (66x44) */ -#define ROOM_T_FRACAVE 8 /*!<部屋型ID:フラクタル地形 / Fractal room (42x24) */ -#define ROOM_T_RANDOM_VAULT 9 /*!<部屋型ID:ランダムVAULT / Random vault (44x22) */ -#define ROOM_T_OVAL 10 /*!<部屋型ID:円形部屋 / Circular rooms (22x22) */ -#define ROOM_T_CRYPT 11 /*!<部屋型ID:聖堂 / Crypts (22x22) */ -#define ROOM_T_TRAP_PIT 12 /*!<部屋型ID:トラップつきモンスターPIT / Trapped monster pit */ -#define ROOM_T_TRAP 13 /*!<部屋型ID:トラップ部屋 / Piranha/Armageddon trap room */ -#define ROOM_T_GLASS 14 /*!<部屋型ID:ガラス部屋 / Glass room */ -#define ROOM_T_ARCADE 15 /*!<部屋型ID:商店 / Arcade */ -#define ROOM_T_FIXED 16 /*!<部屋型ID:固定部屋 / Fixed room */ -#define ROOM_T_MAX 17 /*!<部屋型ID最大数 */ - /* Maximum locked/jammed doors */ #define MAX_LJ_DOORS 8 -- 2.11.0