summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-18 18:24:19 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-18 18:24:19 +0300
commit81dcbc085f750fa8dfe6401b774c1b930e95e5ca (patch)
tree71bde67e767e49d5c3c76181110734e724d39456
parent4932f8c69362844326616ad18b2b7da874f54b88 (diff)
downloadmanaplus-81dcbc085f750fa8dfe6401b774c1b930e95e5ca.tar.gz
manaplus-81dcbc085f750fa8dfe6401b774c1b930e95e5ca.tar.bz2
manaplus-81dcbc085f750fa8dfe6401b774c1b930e95e5ca.tar.xz
manaplus-81dcbc085f750fa8dfe6401b774c1b930e95e5ca.zip
Add new parameter into paths.xml for default skill casting animation.
New parameter: skillCastingAnimation
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/gui/windows/skilldialog.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index cacd7042f..327a4db73 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -644,6 +644,7 @@ DefaultsData* getPathsDefaults()
AddDEF("gmCharCommandSymbol", "#");
AddDEF("linkCommandSymbol", "=");
AddDEF("emptyAtlasName", "ignored");
+ AddDEF("skillCastingAnimation", "");
AddDEF("palettesDir", "");
AddDEF("defaultPaletteFile", "palette.gpl");
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f42ce92ff..7a34ab4f7 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -391,7 +391,9 @@ void SkillDialog::loadXmlFile(const std::string &fileName,
data->particle = XML::getProperty(
node, "particle", "");
data->castingAnimation = XML::getProperty(
- node, "castingAnimation", "");
+ node,
+ "castingAnimation",
+ paths.getStringValue("skillCastingAnimation"));
data->soundHit.sound = XML::getProperty(
node, "soundHit", "");