X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fmap.h;h=8dfe4461320aa3e2e4547bb63fed62b17dac13fc;hb=d1dfbfa5a6f5f05d761238010b4f853088e3a373;hp=ac303a40036fe3660938c015cf9a33fb6fcda5b9;hpb=577b68fc2d491c025bf124c3257f1878b52b1b69;p=plomrogue

diff --git a/src/map.h b/src/map.h
index ac303a4..8dfe446 100644
--- a/src/map.h
+++ b/src/map.h
@@ -9,14 +9,14 @@
 
 
 #include "yx_uint16.h" /* for yx_uint16 and dir enums */
-struct Player;
+struct MapObj;
+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 +28,14 @@ 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".
- */
-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 following
- * (and constrained by) the window size 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". */
+void map_scroll(struct Win * win, struct yx_uint16 map_size, enum dir d);