Minor refactorings in config file parse code to clear up code.

[plomrogue] / src / server / map.c

diff --git a/src/server/map.c b/src/server/map.c
index 9b0f29422b8564d3476b4f9223560413aa912d81..0edd955c4265419f7f09d19d14e10c1066384a62 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;
@@ -55,8 +55,7 @@ extern void init_map()
 extern uint8_t is_passable(struct yx_uint8 pos)
 {
     uint8_t passable = 0;
-    if (   0 <= pos.x && pos.x < world.map.size.x
-        && 0 <= pos.y && pos.y < world.map.size.y)
+    if (pos.x < world.map.size.x && pos.y < world.map.size.y)
     {
         passable = ('.' == world.map.cells[(pos.y * world.map.size.x) + pos.x]);
     }