Server/C: Re-order savefile to easen comparisons with Python variant.

[plomrogue] / src / server / map.c

diff --git a/src/server/map.c b/src/server/map.c
index 0007633711d7ba29a5a7a5a9297c62ff47efaafd..3a5a0a213d1c6f8f644739f1410a0778bb66a9fa 100644 (file)
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,8 +1,14 @@
-/* src/server/map.c */
+/* src/server/map.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #include "map.h"
 #include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
 #include <stdlib.h> /* free() */
+#include <string.h> /* memset() */
 #include "../common/rexit.h" /* exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/yx_uint8.h" /* yx_uint8 */
@@ -199,10 +205,8 @@ extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
     }
     char * err = "Too much wrapping in mv_yx_in_dir_legal().";
     exit_err(   INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south
-             || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south, err);
-    struct yx_uint8 original;
-    original.y = yx->y;
-    original.x = yx->x;
+             || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south,err);
+    struct yx_uint8 original = *yx;
     mv_yx_in_dir(dir, yx);
     if      (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x)
     {
@@ -227,3 +231,11 @@ extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
     }
     return 0;
 }
+
+
+
+extern void init_empty_map(char ** map)
+{
+    *map = try_malloc(world.map.length * world.map.length, __func__);
+    memset(*map, ' ', world.map.length * world.map.length);
+}