Server: Minor refactoring, removal of unneeded is_passable().

[plomrogue] / src / server / map.c

diff --git a/src/server/map.c b/src/server/map.c
index 8ed37d9b50cbd017baf0cb2c0464e5e547aebeab..d98a61f28813730e33388fe48f42b7ec3ff7391b 100644 (file)
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -7,6 +7,7 @@
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/yx_uint8.h" /* struct yx_uint8 */
 #include "rrand.h" /* rrand() */
+#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */
 #include "world.h" /* global world */
 
 
@@ -151,12 +152,12 @@ extern void remake_map()
 
 
 
-extern uint8_t is_passable(struct yx_uint8 pos)
+extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
 {
-    uint8_t passable = 0;
-    if (pos.x < world.map.length && pos.y < world.map.length)
+    uint8_t wraptest = mv_yx_in_dir_wrap(dir, yx, 0);
+    if (!wraptest && yx->x < world.map.length && yx->y < world.map.length)
     {
-        passable = ('.' == world.map.cells[(pos.y * world.map.length) + pos.x]);
+        return 1;
     }
-    return passable;
+    return 0;
 }