diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-07-23 03:36:36 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-07-23 03:36:36 +0300 |
commit | db3c14fe29d0ebd10e5f5cfa843d5d44660ab0aa (patch) | |
tree | 48df43cbea8483ad5d0475f98713ef8059dce653 /src | |
parent | 871f05609ec03cad93773112c3324ba7b0488388 (diff) | |
download | mv-db3c14fe29d0ebd10e5f5cfa843d5d44660ab0aa.tar.gz mv-db3c14fe29d0ebd10e5f5cfa843d5d44660ab0aa.tar.bz2 mv-db3c14fe29d0ebd10e5f5cfa843d5d44660ab0aa.tar.xz mv-db3c14fe29d0ebd10e5f5cfa843d5d44660ab0aa.zip |
Add separate attribute for ground skill effect: castingGroundEffectId
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/windows/skilldialog.cpp | 4 | ||||
-rw-r--r-- | src/resources/skill/skilldata.cpp | 1 | ||||
-rw-r--r-- | src/resources/skill/skilldata.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 02e67408d..562b8471d 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -468,6 +468,8 @@ void SkillDialog::loadSkillData(XmlNodePtr node, node, "srcEffectId", -1); data->dstEffectId = XML::getProperty( node, "dstEffectId", -1); + data->castingGroundEffectId = XML::getProperty( + node, "castingGroundEffectId", -1); skill->addData(level, data); } @@ -723,7 +725,7 @@ void SkillDialog::playCastingDstTileEffect(const int id, SkillData *const data = getSkillDataByLevel(id, level); if (!data) return; - effectManager->triggerDefault(data->castingDstEffectId, + effectManager->triggerDefault(data->castingGroundEffectId, x * 32, y * 32, cur_time + delay / 1000, // end time in seconds diff --git a/src/resources/skill/skilldata.cpp b/src/resources/skill/skilldata.cpp index 74c7718a6..47cde94ed 100644 --- a/src/resources/skill/skilldata.cpp +++ b/src/resources/skill/skilldata.cpp @@ -50,6 +50,7 @@ SkillData::SkillData() : missEffectId(-1), castingSrcEffectId(-1), castingDstEffectId(-1), + castingGroundEffectId(-1), srcEffectId(-1), dstEffectId(-1) { diff --git a/src/resources/skill/skilldata.h b/src/resources/skill/skilldata.h index 016ba98cb..2eb8150c9 100644 --- a/src/resources/skill/skilldata.h +++ b/src/resources/skill/skilldata.h @@ -50,6 +50,7 @@ struct SkillData final int missEffectId; int castingSrcEffectId; int castingDstEffectId; + int castingGroundEffectId; int srcEffectId; int dstEffectId; |