[Fix] #38965 「気合いため」のための concentration() 関数抜け修正。 / Fix forgotten calling concentration().

[hengband/hengband.git] / src / rooms.h

diff --git a/src/rooms.h b/src/rooms.h
index 714eb3f..444a160 100644 (file)
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -58,36 +58,39 @@ struct room_info_type
         byte min_level;
 };
 
-
-/*!
-* 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 */
 
+/* Maximum locked/jammed doors */
+#define MAX_LJ_DOORS 8
+
+/*
+ * A structure type for doors
+ */
+typedef struct
+{
+       FEAT_IDX open;
+       FEAT_IDX broken;
+       FEAT_IDX closed;
+       FEAT_IDX locked[MAX_LJ_DOORS];
+       FEAT_IDX num_locked;
+       FEAT_IDX jammed[MAX_LJ_DOORS];
+       FEAT_IDX num_jammed;
+} door_type;
+
+door_type feat_door[MAX_DOOR_TYPES];
+
 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(POSITION x, POSITION y, int light, POSITION x1, POSITION y1, POSITION x2, POSITION 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 POSITION dist2(POSITION x1, POSITION y1, POSITION x2, POSITION y2, POSITION h1, POSITION h2, POSITION h3, POSITION h4);
+extern void generate_room_floor(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int light);
+extern void generate_fill_perm_bold(POSITION y1, POSITION x1, POSITION y2, POSITION 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(POSITION x1, POSITION x2, POSITION y1, POSITION y2, int difficulty);