summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-04-29 22:32:30 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-29 22:48:39 +0200
commit8f67f2179dd1038f44d4ad3506ff33e9cf2dddbf (patch)
treeabac567dd9bf5b6f1750c0a764caed426e261000
parent4b0f15a3767a2309c433aa77bdeea04c56824322 (diff)
downloadmana-client-8f67f2179dd1038f44d4ad3506ff33e9cf2dddbf.tar.gz
mana-client-8f67f2179dd1038f44d4ad3506ff33e9cf2dddbf.tar.bz2
mana-client-8f67f2179dd1038f44d4ad3506ff33e9cf2dddbf.tar.xz
mana-client-8f67f2179dd1038f44d4ad3506ff33e9cf2dddbf.zip
Single xml solution - compatibility with skill-set and special-set
Mana-mantis: #506.
-rw-r--r--src/gui/skilldialog.cpp3
-rw-r--r--src/resources/specialdb.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 8c8abd19..a0c3e46b 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -368,7 +368,8 @@ void SkillDialog::loadSkills()
for_each_xml_child_node(set, root)
{
- if (xmlStrEqual(set->name, BAD_CAST "set"))
+ if (xmlStrEqual(set->name, BAD_CAST "set") ||
+ xmlStrEqual(set->name, BAD_CAST "skill-set"))
{
setCount++;
setName = XML::getProperty(set, "name", strprintf(_("Skill Set %d"), setCount));
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
index 426a1143..c75f4b1b 100644
--- a/src/resources/specialdb.cpp
+++ b/src/resources/specialdb.cpp
@@ -61,7 +61,8 @@ void SpecialDB::load()
for_each_xml_child_node(set, root)
{
- if (xmlStrEqual(set->name, BAD_CAST "set"))
+ if (xmlStrEqual(set->name, BAD_CAST "set") ||
+ xmlStrEqual(set->name, BAD_CAST "special-set"))
{
setName = XML::getProperty(set, "name", "Actions");