X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fgrid.h;h=16f6702216dfb41bf4f979dc65f1e35919000ed1;hb=a89bf32eb87531922c74fd931a5f1f47479c54d8;hp=f11d8de6d1989f819dcc1d652c8f2a0396ea4b73;hpb=8c1a95510c03a7dab763274007b5f665f109d66a;p=hengband%2Fhengband.git

diff --git a/src/grid.h b/src/grid.h
index f11d8de6d..16f670221 100644
--- a/src/grid.h
+++ b/src/grid.h
@@ -65,7 +65,7 @@
 
 #define place_floor_bold(Y, X) \
 { \
-	set_cave_feat(Y,X,floor_type[randint0(100)]); \
+	set_cave_feat(Y,X,feat_ground_type[randint0(100)]); \
 	cave[Y][X].info &= ~(CAVE_MASK); \
 	add_cave_info(Y,X,CAVE_FLOOR); \
 	delete_monster(Y, X); \
@@ -73,7 +73,7 @@
 
 #define place_floor_grid(C) \
 { \
-	(C)->feat = floor_type[randint0(100)]; \
+	(C)->feat = feat_ground_type[randint0(100)]; \
 	(C)->info &= ~(CAVE_MASK); \
 	(C)->info |= CAVE_FLOOR; \
 	if ((C)->m_idx) delete_monster_idx((C)->m_idx); \
@@ -265,22 +265,24 @@
 
 extern bool new_player_spot(void);
 
-extern void place_random_stairs(int y, int x);
-extern void place_random_door(int y, int x, bool room);
-extern void place_closed_door(int y, int x, int type);
-extern void place_floor(int x1, int x2, int y1, int y2, bool light);
-extern void place_room(int x1, int x2, int y1, int y2, bool light);
-extern void vault_monsters(int y1, int x1, int num);
-extern void vault_objects(int y, int x, int num);
-extern void vault_trap_aux(int y, int x, int yd, int xd);
-extern void vault_traps(int y, int x, int yd, int xd, int num);
+extern void place_random_stairs(POSITION y, POSITION x);
+extern void place_random_door(POSITION y, POSITION x, bool room);
+extern void place_closed_door(POSITION y, POSITION x, int type);
+extern void add_door(POSITION x, POSITION y);
+extern void place_secret_door(POSITION y, POSITION x, int type);
+extern void place_locked_door(POSITION y, POSITION x);
+extern void try_door(POSITION y, POSITION x);
+extern void place_floor(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light);
+extern void place_room(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light);
+extern void vault_monsters(POSITION y1, POSITION x1, int num);
+extern void vault_objects(POSITION y, POSITION x, int num);
+extern void vault_trap_aux(POSITION y, POSITION x, POSITION yd, POSITION xd);
+extern void vault_traps(POSITION y, POSITION x, POSITION yd, POSITION xd, int num);
 
-extern void correct_dir(int *rdir, int *cdir, int y1, int x1, int y2, int x2);
+extern void correct_dir(POSITION *rdir, POSITION *cdir, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 
-extern void rand_dir(int *rdir, int *cdir);
+extern void rand_dir(POSITION *rdir, POSITION *cdir);
 
-extern bool get_is_floor(int x, int y);
-extern void set_floor(int x, int y);
+extern bool get_is_floor(POSITION x, POSITION y);
+extern void set_floor(POSITION x, POSITION y);
 
-extern bool build_tunnel(position row1, position col1, position row2, position col2);
-extern bool build_tunnel2(position x1, position y1, position x2, position y2, int type, int cutoff);