From 1f4244b457c7df5b5981e4c0efcf93a8b6386360 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 27 Jun 2013 01:07:03 +0200
Subject: [PATCH] Simplified internal structure of move_monster().

---
 src/roguelike.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/roguelike.c b/src/roguelike.c
index 84290f1..833b64b 100644
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -120,17 +120,14 @@ void move_monster (struct World * world, struct Monster * monster) {
   if (yx_uint16_cmp (t, world->player->pos)) {
     update_log (world, "\nThe monster hits you.");
     return; }
-  char met_monster = 0;
   struct Monster * other_monster;
   for (other_monster = world->monster; other_monster != 0; other_monster = other_monster->next) {
     if (other_monster == monster)
       continue;
     if (yx_uint16_cmp (t, other_monster->pos)) {
-      met_monster = 1;
-      break; } }
-  if (met_monster)
-    update_log (world, "\nMonster hits monster.");
-  else if (is_passable(world->map, t.y, t.x))
+      update_log (world, "\nMonster hits monster.");
+      return; } }
+  if (is_passable(world->map, t.y, t.x))
     monster->pos = t; }
 
 void move_player (struct World * world, char d) {
-- 
2.30.2