diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-03-13 16:18:38 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-03-13 16:25:18 +0100 |
| commit | 53cf65f40c64a0d2ea8757390179127222faa258 (patch) | |
| tree | a82479f3e77df3021d2105dda604b8e5eb2a90c4 /src/game-server/map.h | |
| parent | 0075aa38fbde5c3df773cca320bcba615296624c (diff) | |
| download | manaserv-53cf65f40c64a0d2ea8757390179127222faa258.tar.gz manaserv-53cf65f40c64a0d2ea8757390179127222faa258.tar.bz2 manaserv-53cf65f40c64a0d2ea8757390179127222faa258.tar.xz manaserv-53cf65f40c64a0d2ea8757390179127222faa258.zip | |
Added script bind to set walkmask for beings
TODO: Inform client about this change.
Reviewed-by: bjorn.
Diffstat (limited to 'src/game-server/map.h')
| -rw-r--r-- | src/game-server/map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/map.h b/src/game-server/map.h index 28faed7f..9f058fbf 100644 --- a/src/game-server/map.h +++ b/src/game-server/map.h @@ -72,7 +72,7 @@ class MapObject { } void addProperty(const std::string &key, const std::string &value) - { + { if (mProperties.contains(key)) LOG_WARN("Duplicate property " << key << " of object " << mName); @@ -178,7 +178,7 @@ class Map void setProperty(const std::string &key, const std::string &val) { mProperties[key] = val; } - /** + /** * Adds an object. */ void addObject(MapObject *object) @@ -198,7 +198,6 @@ class Map unsigned char walkmask, int maxCost = 20) const; - private: /** * Blockmasks for different entities */ @@ -206,6 +205,7 @@ class Map static const unsigned char BLOCKMASK_CHARACTER = 0x01;// = bin 0000 0001 static const unsigned char BLOCKMASK_MONSTER = 0x02; // = bin 0000 0010 + private: // map properties int mWidth, mHeight; int mTileWidth, mTileHeight; |