[Refactor] #39963 Moved TELEPORT_* from spells.h to spells-util.h and made them enum...

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

diff --git a/src/grid.h b/src/grid.h
index c917e84..27b14a1 100644 (file)
--- a/src/grid.h
+++ b/src/grid.h
@@ -14,6 +14,7 @@
  * included in all such copies.
  */
 
+#include "spell/spells-util.h"
 
  /*
   * A single "grid" in a Cave
@@ -199,21 +200,21 @@ extern void remove_mirror(player_type *caster_ptr, POSITION y, POSITION x);
 extern bool is_open(player_type *player_ptr, FEAT_IDX feat);
 extern bool check_local_illumination(player_type *creature_ptr, POSITION y, POSITION x);
 
-extern bool cave_monster_teleportable_bold(player_type *player_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, BIT_FLAGS mode);
-extern bool cave_player_teleportable_bold(player_type *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode);
+extern bool cave_monster_teleportable_bold(player_type *player_ptr, MONSTER_IDX m_idx, POSITION y, POSITION x, teleport_flags mode);
+extern bool cave_player_teleportable_bold(player_type *player_ptr, POSITION y, POSITION x, teleport_flags mode);
 
-typedef enum grid_bold_type
+typedef enum
 {
-       gb_floor,
-       gb_extra,
-       gb_extra_perm,
-       gb_inner,
-       gb_inner_perm,
-       gb_outer,
-       gb_outer_noperm,
-       gb_solid,
-       gb_solid_perm,
-       gb_solid_noperm
+       GB_FLOOR,
+       GB_EXTRA,
+       GB_EXTRA_PERM,
+       GB_INNER,
+       GB_INNER_PERM,
+       GB_OUTER,
+       GB_OUTER_NOPERM,
+       GB_SOLID,
+       GB_SOLID_PERM,
+       GB_SOLID_NOPERM
 } grid_bold_type;
 
 extern void place_grid(player_type *player_ptr, grid_type *g_ptr, grid_bold_type pg_type);