diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-07 17:43:55 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-06-07 18:52:01 +0200 |
| commit | 91f54b7fc9c1ad35316575ef10983a0eabafbe83 (patch) | |
| tree | c8c886fcd207810a03772a1201ca338053bb3fb2 /src | |
| parent | afa134640b2e2c7c0f28a54c8691545848795dd9 (diff) | |
| download | mana-91f54b7fc9c1ad35316575ef10983a0eabafbe83.tar.gz mana-91f54b7fc9c1ad35316575ef10983a0eabafbe83.tar.bz2 mana-91f54b7fc9c1ad35316575ef10983a0eabafbe83.tar.xz mana-91f54b7fc9c1ad35316575ef10983a0eabafbe83.zip | |
Added defaults to empty attacks.
Reviewed-by: Jaxad0127.
Diffstat (limited to 'src')
| -rw-r--r-- | src/resources/beinginfo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index e6dc948e..62990392 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -22,6 +22,7 @@ #include "resources/beinginfo.h" #include "log.h" +#include "configuration.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -90,7 +91,10 @@ const std::string &BeingInfo::getSound(SoundEvent event) const const Attack *BeingInfo::getAttack(int id) const { - static Attack *empty = new Attack(SpriteAction::ATTACK, -1, -1, -1, + static Attack *empty = new Attack(SpriteAction::ATTACK, + -1, // Default strike effect on monster + paths.getIntValue("hitEffectId"), + paths.getIntValue("criticalHitEffectId"), std::string()); Attacks::const_iterator i = mAttacks.find(id); |