Fixed some more pitfalls that hurt working with game maps of maximum size.

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index f10e9cb80a20d50d15c9a49a0b1312baa7879379..7cdb0b5134668af19474c541fa0e39d94cb0a5e6 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -323,7 +323,7 @@ extern void draw_win_map(struct Win * win)
 {
     try_resize_winmap(win, world.map.size.y, world.map.size.x);
     uint16_t z = 0;
-    uint8_t x, y;
+    uint16_t x, y;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0; x < world.map.size.x; x++)

diff --git a/src/client/io.c b/src/client/io.c
index 43a695ab02b90f43356ea9712436f42c11eaa31d..a4dc7f321b6e764714fc52410f0c32f51fc68d37 100644 (file)
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -110,7 +110,7 @@ static void read_map_cells(FILE * file)
     char * f_name = "read_map_cells()";
     free(world.map.cells);
     world.map.cells = try_malloc(world.map.size.y * world.map.size.x, f_name);
-    uint8_t y, x;
+    uint16_t y, x;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0; x < world.map.size.x; x++)

diff --git a/src/server/io.c b/src/server/io.c
index 2507d3b1e3e3a0faee7842261e1f572e8927fedc..1de0bd07c9b6367fadc917bde2f19f500d341fdb 100644 (file)
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -203,7 +203,7 @@ static void write_map(FILE * file)
             }
         }
     }
-    uint8_t x, y;
+    uint16_t x, y;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0; x < world.map.size.x; x++)

diff --git a/src/server/map.c b/src/server/map.c
index 9b0f29422b8564d3476b4f9223560413aa912d81..8bae81a4a47b159233fbeb8d6a73fe6d296b06ab 100644 (file)
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -14,7 +14,7 @@ extern void init_map()
     char * f_name = "init_map()";
     uint32_t size = world.map.size.x * world.map.size.y;
     world.map.cells = try_malloc(size, f_name);
-    uint8_t y, x;
+    uint16_t y, x;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0;