diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-15 17:04:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-15 17:04:31 +0300 |
| commit | 0977134ffdad9ea0e79106fc633ebafd18209765 (patch) | |
| tree | c0c21f68e7e40002ff9de01302d19ffb5e6783e7 /src/gui | |
| parent | 679454f53aa95317f8a1d7a1698c743d98a02fad (diff) | |
| download | mv-0977134ffdad9ea0e79106fc633ebafd18209765.tar.gz mv-0977134ffdad9ea0e79106fc633ebafd18209765.tar.bz2 mv-0977134ffdad9ea0e79106fc633ebafd18209765.tar.xz mv-0977134ffdad9ea0e79106fc633ebafd18209765.zip | |
Add support for different per skill casting animations.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/skillinfo.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/skillinfo.h | 4 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 9 |
3 files changed, 17 insertions, 0 deletions
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp index 5e64103a9..2047ea31c 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/gui/widgets/skillinfo.cpp @@ -38,6 +38,10 @@ SkillInfo::SkillInfo() : skillEffect(), useButton(), errorText(), + castingAction(), + castingRideAction(), + castingSkyAction(), + castingWaterAction(), dataMap(), model(nullptr), data(nullptr), diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index 7b8faa7e4..95099db2c 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -49,6 +49,10 @@ struct SkillInfo final std::string skillEffect; std::string useButton; std::string errorText; + std::string castingAction; + std::string castingRideAction; + std::string castingSkyAction; + std::string castingWaterAction; SkillDataMap dataMap; SkillModel *model; SkillData *data; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 60eb32b64..7a46cf313 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -52,6 +52,7 @@ #include "utils/timer.h" #include "resources/beingcommon.h" +#include "resources/spriteaction.h" #include "debug.h" @@ -339,6 +340,14 @@ void SkillDialog::loadXmlFile(const std::string &fileName) node, "castingSrcEffectId", -1); skill->castingDstEffectId = XML::getProperty( node, "castingDstEffectId", -1); + skill->castingAction = XML::getProperty(node, + "castingAction", SpriteAction::CAST); + skill->castingRideAction = XML::getProperty(node, + "castingRideAction", SpriteAction::CASTRIDE); + skill->castingSkyAction = XML::getProperty(node, + "castingSkyAction", SpriteAction::CASTSKY); + skill->castingWaterAction = XML::getProperty(node, + "castingWaterAction", SpriteAction::CASTWATER); skill->useTextParameter = XML::getBoolProperty( node, "useTextParameter", false); skill->visible = skill->alwaysVisible; |