Fixed bug that led to endless loop in nearest_enemy_dir().

[plomrogue] / src / map.h

diff --git a/src/map.h b/src/map.h
index 1c3475f61c6862d1640a137f4bd58101a2f91ba4..8fb21ee1a3229338ec043e4dfc45c219a4a799fc 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -1,48 +1,43 @@
 /* map.h
  *
- * Struct for the game map and routines to manipulate it.
+ * Struct for the game map and routines to create and scroll on it.
  */
 
 #ifndef MAP_H
 #define MAP_H
 
-
-
 #include "yx_uint16.h" /* for yx_uint16 and dir enums */
-struct Player;
+struct Win;
 
 
 
 struct Map
 {
     struct yx_uint16 size;   /* map's height/width in number of cells */
-    struct yx_uint16 offset; /* the map scroll offset */
     char * cells;            /* sequence of bytes encoding map cells */
 };
 
 
 
-/* Initialize an island map as 64 x 64 cells of "~" cells representing water and
- * "." cells representing land. The shape of the island is generated randomly by
- * starting with a sea containing one land cell in the middle and then going
- * into a cycle of repeatedly selecting a random cell on the map and
- * transforming it into a land cell if it is horizontally or vertically neighbor
- * to one. The cycle ends when a land cell is created that is only one cell away
- * from the edge of the map. The map scroll offset is initialized to 0,0.
+/* Initialize island map as 64 x 64 "~" cells representing water and "." cells
+ * representing land. The shape of the island is generated randomly by starting
+ * with a sea containing one land cell in the middle and then going into a cycle
+ * of repeatedly selecting a random cell on the map and transforming it into a
+ * land cell if it is horizontally or vertically neighbor to one; the cycle ends
+ * when a land cell is due to be created right at the border of the map.
  */
 extern struct Map init_map();
 
-/* Scroll map into direction "dir" by changing the scroll offset if that does
- * not push the map view beyond the size of the map window as described by
- * "win_size".
- */
-extern void map_scroll(struct Map * map, enum dir d, struct yx_uint16 win_size);
+/* Try changing map window's focus into directino "d" (north = "N" etc.). */
+extern void map_scroll(char d);
+
+/* Center map window on player. */
+extern void map_center();
 
-/* Scroll map to center on the player by changing the scroll offset following
- * (and constrained by) the window size as described by "win_size".
+/* Check if coordinate pos on (or beyond) map is accessible to map object
+ * movement.
  */
-extern void map_center_player(struct Map * map, struct Player * player,
-                              struct yx_uint16 win_size);
+extern uint8_t is_passable(struct Map * map, struct yx_uint16 pos);