Split roguelike.(c|h) into main.(c|h) and misc.(c|h).

[plomrogue] / src / objects_on_map.c

diff --git a/src/objects_on_map.c b/src/objects_on_map.c
index 70d4378ade18f3996c0a4752b69e24bb64ea9e71..d74981b6f652ac95f5e0f6430c60761910bf1233 100644 (file)
--- a/src/objects_on_map.c
+++ b/src/objects_on_map.c
@@ -3,7 +3,9 @@
 #include <stdio.h>
 #include "yx_uint16.h"
 #include "readwrite.h"
-#include "roguelike.h"
+#include "misc.h"
+#include "map.h"
+#include "main.h"
 
 static struct ChainMapObject * get_next_cmo (void *, char *, size_t, struct ChainMapObject *);
 
@@ -105,6 +107,9 @@ extern void move_monster (struct World * world, struct Monster * monster) {
   struct yx_uint16 t = mv_yx_in_dir (d, monster->cmo.pos);
   if (yx_uint16_cmp (t, world->player->pos)) {
     update_log (world, "\nThe monster hits you.");
+    world->player->hitpoints--;
+    if (0 == world->player->hitpoints)
+      update_log (world, "\nYou are dead.");
     return; }
   struct Monster * other_monster;
   for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->cmo.next) {