X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmap_objects.c;h=93f46841447aec667f1ddd0322268a0a330c0d6d;hb=2c2521789dc5c8bb77eb36362d4244606f878420;hp=e825755b86a991b1b823756038d1df0a4181ec89;hpb=aafa0cb49e7ec8600dad902411de6e76e111c939;p=plomrogue
diff --git a/src/map_objects.c b/src/map_objects.c
index e825755..93f4684 100644
--- a/src/map_objects.c
+++ b/src/map_objects.c
@@ -11,6 +11,7 @@
#include "misc.h" /* for try_malloc(), try_calloc(), find_passable_pos() */
#include "main.h" /* for World struct */
#include "rexit.h" /* for err_exit() */
+#include "yx_uint16.h" /* for yx_uint16 struct, yx_uint16_cmp() */
@@ -109,7 +110,27 @@ extern void add_map_object(struct World * world, uint8_t type)
world->map_obj_count++;
mo->type = mod->id;
mo->lifepoints = mod->lifepoints;
- mo->pos = find_passable_pos(world->map);
+ while (1)
+ {
+ struct yx_uint16 pos = find_passable_pos(world->map);
+ struct MapObj * mo_ptr;
+ uint8_t clear = 1;
+ for (mo_ptr = world->map_objs;
+ mo_ptr != NULL;
+ mo_ptr = mo_ptr->next)
+ {
+ if (yx_uint16_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
+ {
+ clear = 0;
+ break;
+ }
+ }
+ if (1 == clear)
+ {
+ mo->pos = pos;
+ break;
+ }
+ }
mo->next = NULL;
if (NULL == world->last_map_obj)
{