summaryrefslogtreecommitdiff
path: root/src/npc.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-06-08 22:31:07 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-06-08 22:31:25 +0200
commit2b2b02df79649beed9a49e37f21db996f053d4ca (patch)
tree248dc30bdcc65caa54de0c259b676986bbfcb123 /src/npc.h
parent25875637a2b0b1561e2cf69b94674ee74d8031a3 (diff)
downloadmana-2b2b02df79649beed9a49e37f21db996f053d4ca.tar.gz
mana-2b2b02df79649beed9a49e37f21db996f053d4ca.tar.bz2
mana-2b2b02df79649beed9a49e37f21db996f053d4ca.tar.xz
mana-2b2b02df79649beed9a49e37f21db996f053d4ca.zip
Attempt to clear some of the block/walkmask confusion
Diffstat (limited to 'src/npc.h')
-rw-r--r--src/npc.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/npc.h b/src/npc.h
index 57e6d5a8..fc6f3459 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -46,7 +46,11 @@ class NPC : public Player
* Gets the way an NPC is blocked by other things on the map
*/
virtual unsigned char getWalkMask() const
- { return 0x83; } // blocked like a monster by walls, monsters and characters ( bin 1000 0011)
+ {
+ return Map::BLOCKMASK_WALL
+ | Map::BLOCKMASK_CHARACTER
+ | Map::BLOCKMASK_MONSTER;
+ }
static bool isTalking;