Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 2 insertions, 6 deletions

diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
index 4060b303..bd8985dc 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/itemlinkhandler.cpp
@@ -22,10 +22,9 @@
 #include <sstream>
 #include <string>
 
-#include <SDL_mouse.h>
-
 #include "itemlinkhandler.h"
 #include "itempopup.h"
+#include "viewport.h"
 
 #include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
@@ -49,15 +48,12 @@ void ItemLinkHandler::handleLink(const std::string &link)
     if (id > 0)
     {
         const ItemInfo &iteminfo = ItemDB::get(id);
-        int mouseX, mouseY;
-
-        SDL_GetMouseState(&mouseX, &mouseY);
 
         mItemPopup->setItem(iteminfo);
 
         if (mItemPopup->isVisible())
             mItemPopup->setVisible(false);
         else
-            mItemPopup->view(mouseX, mouseY);
+            mItemPopup->view(viewport->getMouseX(), viewport->getMouseY());
     }
 }