Unify Map struct common to server and client in src/common/map.h.

diff --git a/src/client/map.h b/src/client/map.h
index d104c28a897bbebaa7ece711af1688f64c10ec7a..6cef27edf91801864d138797d2935013c073afdb 100644 (file)
--- a/src/client/map.h
+++ b/src/client/map.h
@@ -3,17 +3,8 @@
  * Routines for the game map window.
  */
 
-#ifndef MAP_H
-#define MAP_H
-
-#include "../common/yx_uint16.h" /* yx_uint16 struct */
-
-
-struct Map
-{
-    struct yx_uint16 size;   /* map's height/width in number of cells */
-    char * cells;            /* sequence of bytes encoding map cells */
-};
+#ifndef MAP_H_CLIENT
+#define MAP_H_CLIENT
 
 
 

diff --git a/src/client/world.h b/src/client/world.h
index 508d1af53ab9fa300c9fae27564ced3757cff080..8d490c85d9bd359c4330e492a88d8e8420df7627 100644 (file)
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -9,7 +9,7 @@
 #include <stdint.h> /* uint8_t, uint16_t */
 #include <stdio.h> /* FILE */
 #include <sys/types.h> /* time_t */
-#include "map.h" /* struct Map */
+#include "../common/map.h" /* struct Map */
 #include "../common/yx_uint8.h" /* struct yx_uint8 */
 #include "keybindings.h" /* stuct KeyBindingDB */
 #include "command_db.h" /* struct CommandDB */

diff --git a/src/common/map.h b/src/common/map.h
new file mode 100644 (file)
index 0000000..8d454ca
--- /dev/null
+++ b/src/common/map.h
@@ -0,0 +1,20 @@
+/* src/common/map.h
+ *
+ * Game map.
+ */
+
+#ifndef MAP_H
+#define MAP_H
+
+#include "yx_uint16.h" /* yx_uint16 struct */
+
+
+struct Map
+{
+    struct yx_uint16 size;   /* map's height/width in number of cells */
+    char * cells;            /* sequence of bytes encoding map cells */
+};
+
+
+
+#endif

diff --git a/src/server/map.c b/src/server/map.c
index 52a9b0b7d11bdefafc9d4d7b3580101d69073ced..464f6e2b3ac0060df3ac96952de556ba28228306 100644 (file)
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -163,4 +163,3 @@ extern uint16_t yx_to_map_pos(struct yx_uint8 * yx)
 {
     return (yx->y * world.map.size.x) + yx->x;
 }
-

diff --git a/src/server/map.h b/src/server/map.h
index 9e3c54858033011cc193c4a5b81007d5f5e39a5c..74bb71ea5dfeb2660bfa126f1c428ad91df564de 100644 (file)
--- a/src/server/map.h
+++ b/src/server/map.h
@@ -1,22 +1,13 @@
 /* src/server/map.h
  *
- * Struct for the game map and routines to create and navigate 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, uint16_t */
 #include "../common/yx_uint8.h" /* yx_uint8 struct */
-#include "../common/yx_uint16.h" /* yx_uint16 struct */
-
-
-
-struct Map
-{
-    struct yx_uint16 size; /* Map's height/width (use max. 256x256)! */
-    char * cells; /* Sequence of bytes encoding map cells. */
-};
 
 
 

diff --git a/src/server/world.h b/src/server/world.h
index be772fcd3ed473ebd0bb50e6c00ab9c2d20d9cd2..732c8107c231118d0966171d7877cf89524d30de 100644 (file)
--- a/src/server/world.h
+++ b/src/server/world.h
@@ -8,7 +8,7 @@
 
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
 #include <stdio.h> /* define FILE */
-#include "map.h" /* struct Map */
+#include "../common/map.h" /* struct Map */
 struct MapObjDef;
 struct MapObjAct;
 struct MapObj;