diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-07-18 16:22:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-07-18 16:22:08 +0300 |
commit | d9bdb29ea7ac15775efd5fc2719cd40061752181 (patch) | |
tree | 6cd5aaf9c7d8a2bd9814307089dcaba79de5ed54 | |
parent | 191938e51d9e9a65b302bf541d706615a22b31a0 (diff) | |
download | manaplus-d9bdb29ea7ac15775efd5fc2719cd40061752181.tar.gz manaplus-d9bdb29ea7ac15775efd5fc2719cd40061752181.tar.bz2 manaplus-d9bdb29ea7ac15775efd5fc2719cd40061752181.tar.xz manaplus-d9bdb29ea7ac15775efd5fc2719cd40061752181.zip |
Add support for loading casting animation for each skill and level.
-rw-r--r-- | src/gui/windows/skilldialog.cpp | 2 | ||||
-rw-r--r-- | src/resources/skill/skilldata.cpp | 3 | ||||
-rw-r--r-- | src/resources/skill/skilldata.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 0610e7f94..f42ce92ff 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -390,6 +390,8 @@ void SkillDialog::loadXmlFile(const std::string &fileName, node, "description", ""); data->particle = XML::getProperty( node, "particle", ""); + data->castingAnimation = XML::getProperty( + node, "castingAnimation", ""); data->soundHit.sound = XML::getProperty( node, "soundHit", ""); diff --git a/src/resources/skill/skilldata.cpp b/src/resources/skill/skilldata.cpp index 65d454260..21a80b79f 100644 --- a/src/resources/skill/skilldata.cpp +++ b/src/resources/skill/skilldata.cpp @@ -37,11 +37,12 @@ SkillData::SkillData() : shortName(), dispName(), description(), - icon(nullptr), particle(), invokeCmd(), + castingAnimation(), soundHit(std::string(), 0), soundMiss(std::string(), 0), + icon(nullptr), updateEffectId(-1), removeEffectId(-1), hitEffectId(-1), diff --git a/src/resources/skill/skilldata.h b/src/resources/skill/skilldata.h index 20365593f..e02cbc145 100644 --- a/src/resources/skill/skilldata.h +++ b/src/resources/skill/skilldata.h @@ -33,14 +33,16 @@ struct SkillData final std::string shortName; std::string dispName; std::string description; - Image *icon; std::string particle; std::string invokeCmd; + std::string castingAnimation; SoundInfo soundHit; SoundInfo soundMiss; + Image *icon; + int updateEffectId; int removeEffectId; int hitEffectId; |