diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-08 18:46:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-08 18:46:21 +0300 |
| commit | 461bfb657a0300f27e3ffed55a78ce9249b54759 (patch) | |
| tree | 0612c7f0c76bfec8792fbef2643de8cba5d60c0c /src/resources/beingcommon.cpp | |
| parent | f57e4aa60a10e33ba707417c08eec9a99a796f9e (diff) | |
| download | mv-461bfb657a0300f27e3ffed55a78ce9249b54759.tar.gz mv-461bfb657a0300f27e3ffed55a78ce9249b54759.tar.bz2 mv-461bfb657a0300f27e3ffed55a78ce9249b54759.tar.xz mv-461bfb657a0300f27e3ffed55a78ce9249b54759.zip | |
Fix on client side walking on monster wall collision.
Diffstat (limited to 'src/resources/beingcommon.cpp')
| -rw-r--r-- | src/resources/beingcommon.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index 1daae68d5..6f9c3aa6d 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -52,7 +52,12 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, info->setQuickActionEffectId(XML::getProperty(node, "quickActionEffect", -1)); +} +void BeingCommon::readWalkingAttributes(BeingInfo *const info, + XmlNodePtrConst node, + const int moreBlockFlags) +{ unsigned char block = 0; std::string walkStr = XML::getProperty( node, "walkType", "walk"); @@ -61,7 +66,7 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, BlockMask::WALL | BlockMask::WATER | BlockMask::AIR | - BlockMask::MONSTERWALL; + moreBlockFlags; StringVect tokens; splitToStringVector(tokens, walkStr, ','); FOR_EACH (StringVectCIter, it, tokens) |