From 461bfb657a0300f27e3ffed55a78ce9249b54759 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 8 Aug 2016 18:46:21 +0300 Subject: Fix on client side walking on monster wall collision. --- src/resources/beingcommon.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/resources/beingcommon.cpp') 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) -- cgit v1.2.3-70-g09d2