3 files changed, 5 insertions, 4 deletions
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index 22deafa3..9948f1ea 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -21,7 +21,6 @@
 #include "account-server/accounthandler.h"
 
 #include "manaserv_protocol.h"
-#include "point.h"
 #include "account-server/account.h"
 #include "account-server/accountclient.h"
 #include "account-server/character.h"
@@ -37,6 +36,7 @@
 #include "net/netcomputer.h"
 #include "utils/functors.h"
 #include "utils/logger.h"
+#include "utils/point.h"
 #include "utils/stringfilter.h"
 #include "utils/tokencollector.h"
 #include "utils/tokendispenser.h"
diff --git a/src/account-server/character.h b/src/account-server/character.h
index a0d4b61c..daa8a31c 100644
--- a/src/account-server/character.h
+++ b/src/account-server/character.h
@@ -26,8 +26,8 @@
 #include <map>
 
 #include "defines.h"
-#include "point.h"
 #include "common/inventorydata.h"
+#include "utils/point.h"
 
 class Account;
 class MessageIn;
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index 448fc289..9bc67edb 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -23,7 +23,6 @@
 
 #include "account-server/storage.h"
 
-#include "point.h"
 #include "account-server/account.h"
 #include "chat-server/chatchannel.h"
 #include "chat-server/guild.h"
@@ -32,6 +31,7 @@
 #include "dal/dalexcept.h"
 #include "dal/dataproviderfactory.h"
 #include "utils/functors.h"
+#include "utils/point.h"
 #include "utils/throwerror.h"
 #include "utils/xml.h"
 
@@ -333,6 +333,7 @@ Character *Storage::getCharacterBySQL(Account *owner)
     // Specialize the string_to functor to convert
     // a string to an unsigned int.
     string_to< unsigned > toUint;
+    string_to< int > toInt;
 
     try
     {
@@ -355,7 +356,7 @@ Character *Storage::getCharacterBySQL(Account *owner)
         character->setLevel(toUshort(charInfo(0, 6)));
         character->setCharacterPoints(toUshort(charInfo(0, 7)));
         character->setCorrectionPoints(toUshort(charInfo(0, 8)));
-        Point pos(toUshort(charInfo(0, 9)), toUshort(charInfo(0, 10)));
+        Point pos(toInt(charInfo(0, 9)), toInt(charInfo(0, 10)));
         character->setPosition(pos);
 
         int mapId = toUint(charInfo(0, 11));