summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-09 17:39:53 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-09 17:39:53 +0300
commit0de391b6566f347d546be4dc56999b3c502fa46b (patch)
tree49acde397bc4d90c63c42690b6c68ad0a33f754d
parente26586ce6efaceb31ec534d488dace4d73702f56 (diff)
downloadmanaplus-0de391b6566f347d546be4dc56999b3c502fa46b.tar.gz
manaplus-0de391b6566f347d546be4dc56999b3c502fa46b.tar.bz2
manaplus-0de391b6566f347d546be4dc56999b3c502fa46b.tar.xz
manaplus-0de391b6566f347d546be4dc56999b3c502fa46b.zip
Add to skill attribute for hit effect on target.
New skills.xml attribute: hitEffectId
-rw-r--r--src/gui/widgets/skilldata.cpp3
-rw-r--r--src/gui/widgets/skilldata.h1
-rw-r--r--src/gui/windows/skilldialog.cpp2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index f06dede07..7accf214e 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -42,7 +42,8 @@ SkillData::SkillData() :
soundHit(std::string(), 0),
soundMiss(std::string(), 0),
updateEffectId(-1),
- removeEffectId(-1)
+ removeEffectId(-1),
+ hitEffectId(-1)
{
}
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
index 03bc021a9..d374e7ec7 100644
--- a/src/gui/widgets/skilldata.h
+++ b/src/gui/widgets/skilldata.h
@@ -45,6 +45,7 @@ struct SkillData final
int updateEffectId;
int removeEffectId;
+ int hitEffectId;
SkillData();
A_DELETE_COPY(SkillData)
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 31cf81ad4..a835666f3 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -374,6 +374,8 @@ void SkillDialog::loadXmlFile(const std::string &fileName)
node, "levelUpEffectId", -1);
data->removeEffectId = XML::getProperty(
node, "removeEffectId", -1);
+ data->hitEffectId = XML::getProperty(
+ node, "hitEffectId", -1);
skill->addData(level, data);
}