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

diff --git a/src/server/map.h b/src/server/map.h
index 464f896..9846a58 100644
--- a/src/server/map.h
+++ b/src/server/map.h
@@ -3,21 +3,30 @@
  * Struct for the game map and routines to create and scroll on it.
  */
 
-#ifndef MAP_H_SERVER
-#define MAP_H_SERVER
+#ifndef MAP_H
+#define MAP_H
 
 #include <stdint.h> /* uint8_t */
-#include "../common/map.h" /* struct Map */
 #include "../common/yx_uint16.h" /* yx_uint16 struct */
 
 
 
-/* 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.
+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.
  */
 extern void init_map();