summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 22:10:53 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 22:11:30 +0300
commit703a3c4df3732e3e88559147001260f3355d42d6 (patch)
treefcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/resources
parent3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff)
downloadmanaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz
manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2
manaplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz
manaplus-703a3c4df3732e3e88559147001260f3355d42d6.zip
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beinginfo.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index a61483940..b93c11ba6 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -38,12 +38,12 @@ struct Attack
std::string particleEffect;
std::string missileParticle;
- Attack(std::string action, std::string particleEffect,
- std::string missileParticle)
+ Attack(std::string action0, std::string particleEffect0,
+ std::string missileParticle0)
{
- this->action = action;
- this->particleEffect = particleEffect;
- this->missileParticle = missileParticle;
+ action = action0;
+ particleEffect = particleEffect0;
+ missileParticle = missileParticle0;
}
};