summaryrefslogtreecommitdiff
path: root/src/statuseffect.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-01 16:15:31 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-01 16:15:31 +0300
commit7abf9198788c8ec476c6099faf7ebd25be372655 (patch)
tree52629718dc762bfd772e3304c98f155869bcd574 /src/statuseffect.cpp
parent7afb9df4a8fdecc0d6b93a7dbd7044e0f6a358f3 (diff)
downloadmv-7abf9198788c8ec476c6099faf7ebd25be372655.tar.gz
mv-7abf9198788c8ec476c6099faf7ebd25be372655.tar.bz2
mv-7abf9198788c8ec476c6099faf7ebd25be372655.tar.xz
mv-7abf9198788c8ec476c6099faf7ebd25be372655.zip
Show enabled status effects in player popups.
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r--src/statuseffect.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 365887a90..eed1a307b 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -45,6 +45,7 @@ StatusEffect::StatusEffect() :
mParticleEffect(),
mIcon(),
mAction(),
+ mName(),
mPersistentParticleEffect(false),
mIsPoison(false),
mIsCart(false),
@@ -199,6 +200,7 @@ void StatusEffect::loadXmlFile(const std::string &fileName)
if (!endEffect)
endEffect = new StatusEffect;
+ startEffect->mName = name;
startEffect->mIsPoison =
(name == paths.getStringValue("poisonEffectName"));
startEffect->mIsCart =
@@ -219,6 +221,7 @@ void StatusEffect::loadXmlFile(const std::string &fileName)
startEffect->mPersistentParticleEffect = (XML::getProperty(
node, "persistent-particle-effect", "no")) != "no";
+ endEffect->mName = startEffect->mName;
endEffect->mIsPoison = startEffect->mIsPoison;
endEffect->mIsCart = startEffect->mIsCart;
endEffect->mIsRiding = startEffect->mIsRiding;