Merge github.com:mana/manaserv

Conflicts:
	src/game-server/inventory.cpp
	src/game-server/inventory.h
	src/game-server/item.h
	src/game-server/main-game.cpp
	src/game-server/skillmanager.cpp
	src/utils/point.h

5 files changed, 18 insertions, 16 deletions

diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index ac7f13c8..5e24927b 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -32,12 +32,13 @@
 #include <set>
 #include <sstream>
 
-void ItemManager::initialize()
+void ItemManager::reload()
 {
-    reload();
+    deinitialize();
+    initialize();
 }
 
-void ItemManager::reload()
+void ItemManager::initialize()
 {
     mVisibleEquipSlotCount = 0;
     readEquipSlotsFile();
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 529e0690..9d96a6ab 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -242,16 +242,16 @@ static void deinitializeServer()
     enet_deinitialize();
 
     // Destroy message handlers
-    delete gameHandler;
-    delete accountHandler;
-    delete postMan;
-    delete gBandwidth;
+    delete gameHandler; gameHandler = 0;
+    delete accountHandler; accountHandler = 0;
+    delete postMan; postMan = 0;
+    delete gBandwidth; gBandwidth = 0;
 
     // Destroy Managers
-    delete stringFilter;
+    delete stringFilter; stringFilter = 0;
     delete monsterManager; monsterManager = 0;
-    delete itemManager; itemManager = 0;
     delete skillManager; skillManager = 0;
+    delete itemManager; itemManager = 0;
     MapManager::deinitialize();
     StatusManager::deinitialize();
 
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 581dfd04..b7efd003 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -52,12 +52,13 @@ Element elementFromString (const std::string &name)
     return val == table.end() ? ELEMENT_ILLEGAL : (*val).second;
 }
 
-void MonsterManager::initialize()
+void MonsterManager::reload()
 {
-    reload();
+    deinitialize();
+    initialize();
 }
 
-void MonsterManager::reload()
+void MonsterManager::initialize()
 {
     XML::Document doc(mMonsterReferenceFile);
     xmlNodePtr rootNode = doc.rootNode();
diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp
index 66d9b939..be6eef4b 100644
--- a/src/game-server/skillmanager.cpp
+++ b/src/game-server/skillmanager.cpp
@@ -91,8 +91,8 @@ void SkillManager::readSkillNode(xmlNodePtr skillNode,
 
     SkillInfo *skillInfo = new SkillInfo;
     skillInfo->setName = setName;
-    skillInfo->skillName = XML::getProperty(skillNode, "name", std::string());
-    skillInfo->skillName = utils::toLower(skillInfo->skillName);
+    skillInfo->skillName = utils::toLower(
+        XML::getProperty(skillNode, "name", std::string()));
     int id = XML::getProperty(skillNode, "id", 0);
 
     if (id <= 0 || skillInfo->skillName.empty())
diff --git a/src/utils/point.h b/src/utils/point.h
index ccd3d2c6..988b6c5a 100644
--- a/src/utils/point.h
+++ b/src/utils/point.h
@@ -75,8 +75,8 @@ class Rectangle
 
         bool contains(const Point &p) const
         {
-            return (p.x >= x && p.x <= x + w &&
-                    p.y >= y && p.y <= y + h);
+            return (p.x >= x && p.x < x + w &&
+                    p.y >= y && p.y < y + h);
         }
 
         bool intersects(const Rectangle &r) const