From 87fa73a2a0414049116cb39b9dbb4fc25cf019fc Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 16 Jun 2013 10:54:27 +0200
Subject: [PATCH] Fix merge issues after rebase.

---
 .../rpg/AndorsTrail/controller/MonsterMovementController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index fd8e45b5f..589cd5d0e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -136,7 +136,7 @@ public final class MonsterMovementController implements EvaluateWalkable {
 
 	@Override
 	public boolean isWalkable(CoordRect r) {
-		return monsterCanMoveTo(world.model.currentMap, r);
+		return monsterCanMoveTo(world.model.currentMap, world.model.currentTileMap, r);
 	}
 
     public void moveMonsterToNextPosition(Monster m, PredefinedMap map) {