summaryrefslogtreecommitdiff
path: root/src/game-server
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-03-13 07:56:59 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-03-13 07:56:59 +0000
commitf531bb006d3eec68b56dc4acefc580a6b9d09138 (patch)
treeffffc2fa6f07d420653e1f048859e7c1f7986fbf /src/game-server
parentefe4ef65bedbaa66e35f3a4354f7422c313ce624 (diff)
downloadmanaserv-f531bb006d3eec68b56dc4acefc580a6b9d09138.tar.gz
manaserv-f531bb006d3eec68b56dc4acefc580a6b9d09138.tar.bz2
manaserv-f531bb006d3eec68b56dc4acefc580a6b9d09138.tar.xz
manaserv-f531bb006d3eec68b56dc4acefc580a6b9d09138.zip
defined block bitmasks in hex instead of decimal like it is done for the walk bitmasks.
Diffstat (limited to 'src/game-server')
-rw-r--r--src/game-server/map.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/map.hpp b/src/game-server/map.hpp
index a5acca2a..f4e24cd8 100644
--- a/src/game-server/map.hpp
+++ b/src/game-server/map.hpp
@@ -173,9 +173,9 @@ class Map
/**
* Blockmasks for different entities
*/
- static const unsigned char BLOCKMASK_WALL = 128; // = bin 1000 0000
- static const unsigned char BLOCKMASK_CHARACTER = 1;// = bin 0000 0001
- static const unsigned char BLOCKMASK_MONSTER = 2; // = bin 0000 0010
+ static const unsigned char BLOCKMASK_WALL = 0x80; // = bin 1000 0000
+ static const unsigned char BLOCKMASK_CHARACTER = 0x01;// = bin 0000 0001
+ static const unsigned char BLOCKMASK_MONSTER = 0x02; // = bin 0000 0010
int *mOccupation[NB_BLOCKTYPES];
int mWidth, mHeight;
int tileWidth, tileHeight;