diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-06-08 22:31:07 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-06-08 22:31:25 +0200 |
commit | 2b2b02df79649beed9a49e37f21db996f053d4ca (patch) | |
tree | 248dc30bdcc65caa54de0c259b676986bbfcb123 /src/npc.h | |
parent | 25875637a2b0b1561e2cf69b94674ee74d8031a3 (diff) | |
download | mana-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.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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; |