X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmap_object_actions.c;h=ff1ea90adeab06775722f1309597ef1632f5f993;hb=c681a0fed768dfff7af1084dedeec25ab8a421fa;hp=f7667150b5e0104d18f9ce9504abeadd99c51b15;hpb=f2a7bc28be634fde4dfe4bde4c83395cab9efa91;p=plomrogue
diff --git a/src/map_object_actions.c b/src/map_object_actions.c
index f766715..ff1ea90 100644
--- a/src/map_object_actions.c
+++ b/src/map_object_actions.c
@@ -3,22 +3,23 @@
#include "map_object_actions.h"
#include /* for malloc(), calloc(), free() */
#include "yx_uint16.h" /* for yx_uint16 struct, mv_yx_in_dir(), yx_uint16_cmp */
-#include "misc.h" /* for rrand(), update_log(), turn_over()*/
+#include "misc.h" /* for update_log(), turn_over()*/
#include "map.h" /* for Map struct */
#include "main.h" /* for World struct */
#include "map_objects.h" /* for map object (definition) structs */
+#include "rrand.h" /* for rrand() */
extern void move_monster(struct World * world, struct Monster * monster)
{
- char d = rrand(0, 0) % 5;
+ char d = rrand() % 5;
struct yx_uint16 t = mv_yx_in_dir(d, monster->map_obj.pos);
char * msg = malloc(100);
struct MapObjDef * mod = get_map_obj_def(world, monster->map_obj.type);
char * desc = mod->desc;
char * desc_other;
- if (yx_uint16_cmp(t, world->player->pos))
+ if (yx_uint16_cmp(&t, &world->player->pos))
{
sprintf(msg, "\nThe %s hits you.", desc);
update_log(world, msg);
@@ -38,9 +39,9 @@ extern void move_monster(struct World * world, struct Monster * monster)
{
continue;
}
- if (yx_uint16_cmp(t, other_monster->map_obj.pos))
+ if (yx_uint16_cmp(&t, &other_monster->map_obj.pos))
{
- mod = get_map_obj_def(world, monster->map_obj.type);
+ mod = get_map_obj_def(world, other_monster->map_obj.type);
desc_other = mod->desc;
sprintf(msg, "\n%s bumps into %s.", desc, desc_other);
update_log(world, msg);
@@ -67,7 +68,7 @@ extern void move_player (struct World * world, enum dir d)
monster != 0;
monster = monster->map_obj.next)
{
- if (yx_uint16_cmp(t, monster->map_obj.pos))
+ if (yx_uint16_cmp(&t, &monster->map_obj.pos))
{
mod = get_map_obj_def(world, monster->map_obj.type);
desc = mod->desc;