Removed redundancy between record_control() and player_control() by re-writing their...

[plomrogue] / src / map.h

diff --git a/src/map.h b/src/map.h
index 9bcd11b004c0e693c3204f118f6277f9e4e64c49..7cc9871abdc341e5affec55d3ed6bd8430fb8e02 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -6,17 +6,14 @@
 #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 */
 };
 
@@ -27,22 +24,15 @@ struct Map
  * 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.
+ * 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);
 
-/* Scroll map to center on the player by changing the scroll offset as far as is
- * possible sans leaving the size of the map window as described by "win_size".
- */
-extern void map_center_player(struct Map * map, struct Player * player,
-                              struct yx_uint16 win_size);
+
+/* Try to change the view center of map "win" of "map_size" into dir "d". */
+extern void map_scroll(struct Win * win, struct yx_uint16 map_size, enum dir d);