X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Frooms.h;h=34a1efcb2c40401bbcbe9e20d45455dd844cffce;hb=f8bca3fd821b2813e49caed5284ee308a30eb231;hp=cf1c3a4c9e51c7567bfabc1e3e1d6e833f9294df;hpb=173d1efd3c6eb41a0e5456e12306850c731f61a4;p=hengband%2Fhengband.git

diff --git a/src/rooms.h b/src/rooms.h
index cf1c3a4c9..34a1efcb2 100644
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -1,49 +1,47 @@
-/*
- * File: rooms.h
- * Purpose: Header file for rooms.c, used only in generate.c
- */
-
-/*
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- *
+/*!
+ * @file rooms.h
+ * @brief 部屋生成処理の定義ヘッダー / Header file for rooms.c, used only in generate.c
+ * @date 2014/09/07
+ * @author
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke<br>
  * This software may be copied and distributed for educational, research,
  * and not for profit purposes provided that this copyright and statement
- * are included in all such copies.  Other copyrights may also apply.
+ * are included in all such copies.  Other copyrights may also apply.<br
  */
 
-
-/* Number of rooms to attempt (was 50) */
-#define DUN_ROOMS_MIN	10
-#define DUN_ROOMS_MAX	100
-
-
-/* Room types for generate_lake() */
-#define LAKE_T_LAVA        1
-#define LAKE_T_WATER       2
-#define LAKE_T_CAVE        3
-#define LAKE_T_EARTH_VAULT 4
-#define LAKE_T_AIR_VAULT   5
-#define LAKE_T_WATER_VAULT 6
-#define LAKE_T_FIRE_VAULT  7
-
-
-/* Room types for room_build() */
-#define ROOM_T_NORMAL         0	 /* Simple (33x11) */
-#define ROOM_T_OVERLAP        1	 /* Overlapping (33x11) */
-#define ROOM_T_CROSS          2	 /* Crossed (33x11) */
-#define ROOM_T_INNER_FEAT     3	 /* Large (33x11) */
-#define ROOM_T_NEST           4	 /* Monster nest (33x11) */
-#define ROOM_T_PIT            5	 /* Monster pit (33x11) */
-#define ROOM_T_LESSER_VAULT   6	 /* Lesser vault (33x22) */
-#define ROOM_T_GREATER_VAULT  7	 /* Greater vault (66x44) */
-#define ROOM_T_FRACAVE        8	 /* Fractal cave (42x24) */
-#define ROOM_T_RANDOM_VAULT   9	 /* Random vault (44x22) */
-#define ROOM_T_OVAL          10	 /* Circular rooms (22x22) */
-#define ROOM_T_CRYPT         11	 /* Crypts (22x22) */
-#define ROOM_T_TRAP_PIT      12	 /* Trapped monster pit */
-#define ROOM_T_TRAP          13	 /* Piranha/Armageddon trap room */
-
-#define ROOM_T_MAX 14
+#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 cave (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最大数 */
 
 
 /*
@@ -61,13 +59,39 @@ struct room_info_type
 };
 
 
+/*!
+* vaultに配置可能なモンスターの条件を指定するマクロ / Monster validation macro
+*
+* Line 1 -- forbid town monsters
+* Line 2 -- forbid uniques
+* Line 3 -- forbid aquatic monsters
+*/
+#define vault_monster_okay(I) \
+	(mon_hook_dungeon(I) && \
+	 !(r_info[I].flags1 & RF1_UNIQUE) && \
+	 !(r_info[I].flags7 & RF7_UNIQUE2) && \
+	 !(r_info[I].flagsr & RFR_RES_ALL) && \
+	 !(r_info[I].flags7 & RF7_AQUATIC))
+
+
 /* Externs */
 #ifdef ALLOW_CAVERNS_AND_LAKES
 extern void build_lake(int type);
 extern void build_cavern(void);
 #endif /* ALLOW_CAVERNS_AND_LAKES */
 
-extern bool room_build(int typ);
-extern void generate_rooms(void);
-extern void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault);
-
+extern bool generate_rooms(void);
+extern void build_maze_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize, bool is_vault);
+extern bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width);
+extern void build_small_room(POSITION x0, POSITION y0);
+extern void add_outer_wall(int x, int y, int light, int x1, int y1, int x2, int y2);
+extern int dist2(int x1, int y1, int x2, int y2, int h1, int h2, int h3, int h4);
+extern void generate_room_floor(int y1, int x1, int y2, int x2, int light);
+extern void generate_fill_perm_bold(int y1, int x1, int y2, int x2);
+extern void generate_hmap(POSITION y0, POSITION x0, POSITION xsiz, POSITION ysiz, int grd, int roug, int cutoff);
+extern bool generate_fracave(POSITION y0, POSITION x0, POSITION xsize, POSITION ysize, int cutoff, bool light, bool room);
+extern void fill_treasure(int x1, int x2, int y1, int y2, int difficulty);
+extern bool generate_lake(int y0, int x0, int xsize, int ysize, int c1, int c2, int c3, int type);
+extern void build_recursive_room(int x1, int y1, int x2, int y2, int power);
+extern void build_room(int x1, int x2, int y1, int y2);
+extern void r_visit(int y1, int x1, int y2, int x2, int node, int dir, int *visited);