Simplified textfile_sizes() and replaced all get_linemax() calls with it.

[plomrogue] / src / map.h

diff --git a/src/map.h b/src/map.h
index ac303a40036fe3660938c015cf9a33fb6fcda5b9..a1d607ac2d7f0a2cffc949f111be42d9079a8b43 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -1,22 +1,19 @@
 /* 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 */
 };
 
@@ -28,21 +25,22 @@ struct Map
  * 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. The map scroll offset is initialized to 0,0.
+ * 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".
+/* Try to change the view center of map into directino described by "d" (north
+ * = "N", east = "E" etc.).
  */
-extern void map_scroll(struct Map * map, enum dir d, struct yx_uint16 win_size);
+extern void map_scroll(char d);
+
+/* Center map 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);