Made the flooritems position set back in pixels.

The position is centered to the nearest tile center in tA.

2 files changed, 12 insertions, 20 deletions

diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index af3457db..d8365d79 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -26,8 +26,6 @@
 #include "net/manaserv/manaserv_protocol.h"
 #include "net/manaserv/messagein.h"
 
-#include "game.h"
-#include "map.h"
 #include "log.h"
 
 namespace ManaServ {
@@ -58,21 +56,7 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
 
                 if (itemId)
                 {
-                    if (Game *game = Game::instance())
-                    {
-                        if (Map *map = game->getCurrentMap())
-                        {
-                            actorSpriteManager->createItem(id, itemId,
-                                                     x / map->getTileWidth(),
-                                                     y / map->getTileHeight());
-                        }
-                        else
-                        {
-                            logger->log(
-                                    "ItemHandler: An item wasn't created "
-                                    "because of Game/Map not initialized...");
-                        }
-                    }
+                    actorSpriteManager->createItem(id, itemId, Vector(x, y));
                 }
                 else if (FloorItem *item = actorSpriteManager->findItem(id))
                 {
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index a8e98860..e452ccf2 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -21,12 +21,14 @@
 
 #include "net/tmwa/itemhandler.h"
 
-#include "actorspritemanager.h"
-
 #include "net/messagein.h"
 
 #include "net/tmwa/protocol.h"
 
+#include "actorspritemanager.h"
+#include "game.h"
+#include "map.h"
+
 namespace TmwAthena {
 
 ItemHandler::ItemHandler()
@@ -54,7 +56,13 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
                 int y = msg.readInt16();
                 msg.skip(4);     // amount,subX,subY / subX,subY,amount
 
-                actorSpriteManager->createItem(id, itemId, x, y);
+                Game *game = Game::instance();
+                if (!game)
+                    break;
+
+                if (Map *map = game->getCurrentMap())
+                    actorSpriteManager->createItem(id, itemId,
+                                                   map->getTileCenter(x, y));
             }
             break;