diff options
| author | David Athay <ko2fan@gmail.com> | 2011-11-16 17:21:58 -0600 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2011-11-16 17:21:58 -0600 |
| commit | b72dd300ab1a315f893facf8a302fa7c9dd00720 (patch) | |
| tree | bd736d314375d7d3e0852f3ca2d2e8a5e8114aec /src/gui/skilldialog.cpp | |
| parent | 701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (diff) | |
| parent | b9bf0acfe46222508c9910c2a2b750feafb5a0d2 (diff) | |
| download | mana-client-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.gz mana-client-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.bz2 mana-client-b72dd300ab1a315f893facf8a302fa7c9dd00720.tar.xz mana-client-b72dd300ab1a315f893facf8a302fa7c9dd00720.zip | |
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/gui/skilldialog.cpp')
| -rw-r--r-- | src/gui/skilldialog.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 207e3ded..b48df8df 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -54,6 +54,8 @@ #include <set> #include <string> +#define SKILLS_FILE "skills.xml" + class SkillModel; class SkillEntry; @@ -230,8 +232,7 @@ SkillDialog::SkillDialog(): SkillDialog::~SkillDialog() { - // Clear gui - loadSkills(""); + clearSkills(); } void SkillDialog::action(const gcn::ActionEvent &event) @@ -279,7 +280,7 @@ void SkillDialog::update() } } -void SkillDialog::loadSkills(const std::string &file) +void SkillDialog::clearSkills() { // Fixes issues with removing tabs if (mTabs->getSelectedTabIndex() != -1) @@ -296,11 +297,13 @@ void SkillDialog::loadSkills(const std::string &file) delete_all(mSkills); mSkills.clear(); +} - if (file.length() == 0) - return; +void SkillDialog::loadSkills() +{ + clearSkills(); - XML::Document doc(file); + XML::Document doc(SKILLS_FILE); xmlNodePtr root = doc.rootNode(); int setCount = 0; @@ -311,7 +314,7 @@ void SkillDialog::loadSkills(const std::string &file) if (!root || !xmlStrEqual(root->name, BAD_CAST "skills")) { - logger->log("Error loading skills file: %s", file.c_str()); + logger->log("Error loading skills file: %s", SKILLS_FILE); if (Net::getNetworkType() == ServerInfo::TMWATHENA) { |