From 6a6b36fa2d19a6ea9d39b975354709e7ad82281d Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Tue, 9 Feb 2010 02:54:09 +0100
Subject: Pushed away some 32 hardcoded values.

---
 src/net/manaserv/itemhandler.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/net/manaserv')

diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index 6a9dec74..802f9303 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -26,6 +26,10 @@
 #include "net/manaserv/protocol.h"
 #include "net/manaserv/messagein.h"
 
+#include "game.h"
+#include "map.h"
+#include "log.h"
+
 namespace ManaServ {
 
 ItemHandler::ItemHandler()
@@ -54,7 +58,23 @@ void ItemHandler::handleMessage(Net::MessageIn &msg)
 
                 if (itemId)
                 {
-                    floorItemManager->create(id, itemId, x / 32, y / 32);
+                    Game *game = Game::instance();
+                    Map *map = 0;
+                    if (game)
+                    {
+                        map = game->getCurrentMap();
+                        if (map)
+                        {
+                            floorItemManager->create(id,
+                                                     itemId,
+                                                     x / map->getTileWidth(),
+                                                     y / map->getTileHeight());
+                        }
+                        else
+                          logger->log(
+                          "ItemHandler: An item wasn't created because of"
+                          "Game/Map not initialized...");
+                    }
                 }
                 else if (FloorItem *item = floorItemManager->findById(id))
                 {
-- 
cgit v1.2.3-70-g09d2