X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fthings.c;h=804f5231d15489aa5f096c32cf0ae67f88f0354c;hb=37382f424bcfc92dcb2ef291bcce3aca8aa0772a;hp=ffa30b01324b4405c143fa6d3c5617d06cb052fe;hpb=6b72c6d2208d2a6bf120ef2239c0134550ed32f0;p=plomrogue

diff --git a/src/server/things.c b/src/server/things.c
index ffa30b0..804f523 100644
--- a/src/server/things.c
+++ b/src/server/things.c
@@ -11,11 +11,9 @@
 #include "../common/yx_uint8.h" /* yx_uint8 */
 #include "cleanup.h" /* set_cleanup_flag() */
 #include "hardcoded_strings.h" /* s */
-#include "map.h" /* is_passable() */
 #include "rrand.h" /* rrand() */
 #include "thing_actions.h" /* actor_wait */
 #include "world.h" /* world */
-#include "yx_uint8.h" /* yx_uint8_cmp() */
 
 
 
@@ -267,10 +265,11 @@ extern void add_things(uint8_t type, uint8_t n)
         struct yx_uint8 pos;
         while (1)
         {
-            char * err = "Space to put thing on too hard to find."
-                         "Map too small?";
+            char * err="Space to put thing on too hard to find. Map too small?";
             uint16_t i_pos = 0;
-            for (pos.y = pos.x = 0; 0 == is_passable(pos); i_pos++)
+            for (pos.y = pos.x = 0;
+                 '.' != world.map.cells[pos.y * world.map.length + pos.x];
+                 i_pos++)
             {
                 exit_err(UINT16_MAX == i_pos, err);
                 pos.y = rrand() % world.map.length;
@@ -280,7 +279,7 @@ extern void add_things(uint8_t type, uint8_t n)
             uint8_t clear = 1;
             for (t = world.things; t; t = t->next)
             {
-                if (yx_uint8_cmp(&pos, &t->pos) && 0 != t->lifepoints)
+                if (0 != t->lifepoints && pos.y==t->pos.y && pos.x==t->pos.x)
                 {
                     clear = 0;
                     break;