[Refactor] #37353 型の置換。 / Type replacement.

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

diff --git a/src/grid.h b/src/grid.h
index 6cb9c83..08b7365 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -189,7 +189,7 @@
 #define place_outer_noperm_bold(Y, X) \
 { \
        feature_type *_f_ptr = &f_info[feat_wall_outer]; \
-       if (permanent_wall(_f_ptr)) set_cave_feat(Y, X, feat_state(feat_wall_outer, FF_UNPERM)); \
+       if (permanent_wall(_f_ptr)) set_cave_feat(Y, X, (s16b)feat_state(feat_wall_outer, FF_UNPERM)); \
        else set_cave_feat(Y,X,feat_wall_outer); \
        cave[Y][X].info &= ~(CAVE_MASK); \
        add_cave_info(Y,X,(CAVE_OUTER | CAVE_VAULT)); \
@@ -199,7 +199,7 @@
 #define place_outer_noperm_grid(C) \
 { \
        feature_type *_f_ptr = &f_info[feat_wall_outer]; \
-       if (permanent_wall(_f_ptr)) (C)->feat = feat_state(feat_wall_outer, FF_UNPERM); \
+       if (permanent_wall(_f_ptr)) (C)->feat = (s16b)feat_state(feat_wall_outer, FF_UNPERM); \
        else (C)->feat = feat_wall_outer; \
        (C)->info &= ~(CAVE_MASK); \
        (C)->info |= (CAVE_OUTER | CAVE_VAULT); \
@@ -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 correct_dir(int *rdir, int *cdir, int y1, int x1, int y2, int x2);
+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, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
 
 extern void rand_dir(int *rdir, int *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(int row1, int col1, int row2, int col2);
-extern bool build_tunnel2(int x1, int y1, int x2, int y2, int type, int cutoff);