Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	po/fi.po
	po/fr.po
	src/gui/skilldialog.cpp
	src/localplayer.cpp
	src/net/manaserv/generalhandler.cpp
	src/net/tmwa/buysellhandler.cpp
	src/net/tmwa/generalhandler.cpp
	src/net/tmwa/playerhandler.cpp
	src/net/tmwa/specialhandler.cpp
	src/winver.h

1 files changed, 10 insertions, 7 deletions

diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index c7976caa..19bd06d6 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -56,6 +56,8 @@
 #include <set>
 #include <string>
 
+#define SKILLS_FILE "skills.xml"
+
 class SkillModel;
 class SkillEntry;
 
@@ -235,8 +237,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    // Clear gui
-    loadSkills("");
+    clearSkills();
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
@@ -291,7 +292,7 @@ void SkillDialog::event(Event::Channel channel, const Event &event)
     }
 }
 
-void SkillDialog::loadSkills(const std::string &file)
+void SkillDialog::clearSkills()
 {
     // Fixes issues with removing tabs
     if (mTabs->getSelectedTabIndex() != -1)
@@ -308,11 +309,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;
@@ -323,7 +326,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)
         {