X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.h;h=641cb797edca08f8d9ef95692901777d84eb6fd3;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=9846a58635f251dc2bf8295cbf1c9f7cd748580e;hpb=e03020342a74aef143b1ec38c18966dac64181b5;p=plomrogue

diff --git a/src/server/map.h b/src/server/map.h
index 9846a58..641cb79 100644
--- a/src/server/map.h
+++ b/src/server/map.h
@@ -1,39 +1,33 @@
 /* src/server/map.h
  *
- * Struct for the game map and routines to create and scroll on it.
+ * Routines to create and navigate game map.
  */
 
-#ifndef MAP_H
-#define MAP_H
+#ifndef MAP_H_SERVER
+#define MAP_H_SERVER
 
-#include <stdint.h> /* uint8_t */
-#include "../common/yx_uint16.h" /* yx_uint16 struct */
+#include <stdint.h> /* uint8_t, uint16_t */
+#include "../common/yx_uint8.h" /* yx_uint8 struct */
 
 
 
-struct Map
-{
-    struct yx_uint16 size; /* Map's height/width in number of cells. */
-    char * cells; /* Sequence of bytes encoding map cells. */
-    uint8_t dist_orthogonal; /* Ratio of the diagonal movement penalty as   */
-    uint8_t dist_diagonal;   /* encoded by (.dist_diagonal/.dist_orthonal). */
-};
-
-
-
-/* Initialize island map "~" 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.
+/* (Re-)make island map "~" cells representing water and "." cells representing
+ * land. The island shape is built randomly from world.seed_map by starting with
+ * a sea of one land cell in the middle, then going into a cycle of repeatedly
+ * selecting a random sea cell and transforming it into land if it is neighbor
+ * to land; the cycle ends when a land cell is due to be created right at the
+ * border of the map. Lots of 'X' cells representing trees are put on the
+ * island.
  */
-extern void init_map();
+extern void remake_map();
 
-/* Check if coordinate "pos" on (or beyond) world.map is accessible to map
- * object movement.
+/* Check if coordinate "pos" on (or beyond) world.map is accessible to thing
+ * movement.
  */
-extern uint8_t is_passable(struct yx_uint16 pos);
+extern uint8_t is_passable(struct yx_uint8 pos);
+
+/* Transform "yx" to an index position in the world map. */
+extern uint16_t yx_to_map_pos(struct yx_uint8 * yx);