diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-11-14 18:02:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-11-14 18:02:03 +0300 |
commit | 4edbdf124303f0e7c229f43a5054755e112ff6b4 (patch) | |
tree | 54d355cb568b07108c08db0f712c072d60c1a7ce /src/resources/beinginfo.cpp | |
parent | 15424641cca695650f4b56c37711c12c81cf2c32 (diff) | |
download | mv-4edbdf124303f0e7c229f43a5054755e112ff6b4.tar.gz mv-4edbdf124303f0e7c229f43a5054755e112ff6b4.tar.bz2 mv-4edbdf124303f0e7c229f43a5054755e112ff6b4.tar.xz mv-4edbdf124303f0e7c229f43a5054755e112ff6b4.zip |
Fix attack sprite actions. Add ride attack action.
Diffstat (limited to 'src/resources/beinginfo.cpp')
-rw-r--r-- | src/resources/beinginfo.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 79969e71e..b857335ba 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -41,8 +41,11 @@ BeingInfo *BeingInfo::unknown = nullptr; Attack *BeingInfo::empty = new Attack(SpriteAction::ATTACK, - SpriteAction::ATTACKSKY, SpriteAction::ATTACKWATER, - -1, -1, -1, -1, std::string()); + SpriteAction::ATTACKSKY, + SpriteAction::ATTACKWATER, + SpriteAction::ATTACKRIDE, + -1, -1, -1, -1, + std::string()); BeingInfo::BeingInfo() : mDisplay(), @@ -169,6 +172,7 @@ void BeingInfo::addAttack(const int id, const std::string &action, const std::string &skyAction, const std::string &waterAction, + const std::string &rideAction, const int effectId, const int hitEffectId, const int criticalHitEffectId, @@ -176,8 +180,15 @@ void BeingInfo::addAttack(const int id, const std::string &missileParticle) { delete mAttacks[id]; - mAttacks[id] = new Attack(action, skyAction, waterAction, effectId, - hitEffectId, criticalHitEffectId, missEffectId, missileParticle); + mAttacks[id] = new Attack(action, + skyAction, + waterAction, + rideAction, + effectId, + hitEffectId, + criticalHitEffectId, + missEffectId, + missileParticle); } void BeingInfo::clear() |