summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-20 17:18:48 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-20 17:18:48 +0300
commitfa923f929b3f52a18273b5831425b2e3db08e583 (patch)
tree871b78176375b51f418c2d9dc4445ea98489f407
parent130ad803401e9d582a2118d9bc92b984222b00f1 (diff)
downloadmanaplus-fa923f929b3f52a18273b5831425b2e3db08e583.tar.gz
manaplus-fa923f929b3f52a18273b5831425b2e3db08e583.tar.bz2
manaplus-fa923f929b3f52a18273b5831425b2e3db08e583.tar.xz
manaplus-fa923f929b3f52a18273b5831425b2e3db08e583.zip
Fix cart enable/disable status effect.
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/statuseffect.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index a2e7524cc..343018204 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -220,7 +220,7 @@ void ActorSprite::updateStatusEffect(const int index, const bool newStatus)
return;
if (effect->isPoison() && getType() == ActorType::Player)
setPoison(newStatus);
- if (localPlayer == this)
+ if (effect->isCart() && localPlayer == this)
setHaveCart(newStatus);
handleStatusEffect(effect, index);
}
diff --git a/src/statuseffect.h b/src/statuseffect.h
index 143124948..4cba35432 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -77,6 +77,9 @@ class StatusEffect final
bool isPoison() const A_WARN_UNUSED
{ return mIsPoison; }
+ bool isCart() const A_WARN_UNUSED
+ { return mIsCart; }
+
/**
* Retrieves a status effect.
*