OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-15 08:10:09 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix merge issues after rebase.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-06-16 10:54:27 +02:00
parent 048ea6b356
commit 87fa73a2a0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
View File

@@ -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) {