diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-23 23:19:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-23 23:19:30 +0300 |
commit | 91075015ad4b5bd576c1a5668a11ea0227dd6bd1 (patch) | |
tree | 181df7013e6bfdd41cad4f2e9f18ad8944b79d04 /src/resources/beinginfo.cpp | |
parent | 66f7df70fb03d487ae0c667adec3d5ad6e11721e (diff) | |
download | manaverse-91075015ad4b5bd576c1a5668a11ea0227dd6bd1.tar.gz manaverse-91075015ad4b5bd576c1a5668a11ea0227dd6bd1.tar.bz2 manaverse-91075015ad4b5bd576c1a5668a11ea0227dd6bd1.tar.xz manaverse-91075015ad4b5bd576c1a5668a11ea0227dd6bd1.zip |
add support for attacksky and attackwater actions.
Diffstat (limited to 'src/resources/beinginfo.cpp')
-rw-r--r-- | src/resources/beinginfo.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 1d316df5e..48e8b8493 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -32,6 +32,7 @@ BeingInfo *BeingInfo::unknown = nullptr; Attack *BeingInfo::empty = new Attack(SpriteAction::ATTACK, + SpriteAction::ATTACKSKY, SpriteAction::ATTACKWATER, -1, -1, -1, -1, std::string()); BeingInfo::BeingInfo() : @@ -128,14 +129,16 @@ const Attack *BeingInfo::getAttack(const int id) const return (i == mAttacks.end()) ? empty : (*i).second; } -void BeingInfo::addAttack(const int id, std::string action, const int effectId, - const int hitEffectId, const int criticalHitEffectId, +void BeingInfo::addAttack(const int id, std::string action, + std::string skyAction, std::string waterAction, + const int effectId, const int hitEffectId, + const int criticalHitEffectId, const int missEffectId, const std::string &missileParticle) { delete mAttacks[id]; - mAttacks[id] = new Attack(action, effectId, hitEffectId, - criticalHitEffectId, missEffectId, missileParticle); + mAttacks[id] = new Attack(action, skyAction, waterAction, effectId, + hitEffectId, criticalHitEffectId, missEffectId, missileParticle); } void BeingInfo::clear() |