[Refactor] #37353 monster-hook～rooms-*間整理。 / Refactor between monster-hook and rooms-*.

[hengbandforosx/hengbandosx.git] / src / rooms.h

diff --git a/src/rooms.h b/src/rooms.h
index 97d3b43..4ceb6a5 100644 (file)
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -58,22 +58,6 @@ 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);
@@ -81,17 +65,17 @@ extern void build_cavern(void);
 #endif /* ALLOW_CAVERNS_AND_LAKES */
 
 extern bool generate_rooms(void);
-extern void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault);
+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(int x0, int 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 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 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(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);
+extern void fill_treasure(POSITION x1, POSITION x2, POSITION y1, POSITION y2, int difficulty);
+extern bool generate_lake(POSITION y0, POSITION x0, POSITION xsize, POSITION ysize, int c1, int c2, int c3, int type);
+extern void build_recursive_room(POSITION x1, POSITION y1, POSITION x2, POSITION y2, int power);
+extern void build_room(POSITION x1, POSITION x2, POSITION y1, POSITION y2);
+extern void r_visit(POSITION y1, POSITION x1, POSITION y2, POSITION x2, int node, DIRECTION dir, int *visited);