diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-07 19:16:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-07 19:16:09 +0300 |
| commit | ac8a0111677c27779b2e7effe8ffe42ea013eb57 (patch) | |
| tree | ade8601cace894f6ce9d6c0833fb6fe6c700b576 /src/resources/beingcommon.cpp | |
| parent | b1753d59caa299c668b9c269e87f96c46e0ab33a (diff) | |
| download | plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.gz plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.bz2 plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.xz plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.zip | |
Add monster wall collision type.
Diffstat (limited to 'src/resources/beingcommon.cpp')
| -rw-r--r-- | src/resources/beingcommon.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index aba464158..1daae68d5 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -60,7 +60,8 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, const int allFlags = BlockMask::GROUND | BlockMask::WALL | BlockMask::WATER | - BlockMask::AIR; + BlockMask::AIR | + BlockMask::MONSTERWALL; StringVect tokens; splitToStringVector(tokens, walkStr, ','); FOR_EACH (StringVectCIter, it, tokens) @@ -73,6 +74,8 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, block |= allFlags; else if (walkStr == "wall") block |= BlockMask::WALL; + else if (walkStr == "monsterwall") + block |= BlockMask::MONSTERWALL; else if (walkStr == "swim" || walkStr == "water") block |= BlockMask::WATER; else if (walkStr == "walkswim" || walkStr == "swimwalk") // legacy |