1 files changed, 25 insertions, 21 deletions
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index a0697c5d..d4de3477 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,24 +19,26 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "inventorywindow.h"
-#include "itemshortcutcontainer.h"
-#include "itempopup.h"
-#include "palette.h"
-#include "viewport.h"
+#include "gui/itemshortcutcontainer.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../itemshortcut.h"
-#include "../keyboardconfig.h"
-#include "../localplayer.h"
+#include "gui/inventorywindow.h"
+#include "gui/itempopup.h"
+#include "gui/palette.h"
+#include "gui/viewport.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "itemshortcut.h"
+#include "keyboardconfig.h"
+#include "localplayer.h"
 
-#include "../utils/stringutils.h"
+#include "resources/image.h"
+#include "resources/iteminfo.h"
+#include "resources/resourcemanager.h"
+
+#include "utils/stringutils.h"
 
 ItemShortcutContainer::ItemShortcutContainer():
     ShortcutContainer(),
@@ -47,7 +48,7 @@ ItemShortcutContainer::ItemShortcutContainer():
     addMouseListener(this);
     addWidgetListener(this);
 
-    mItemPopup = new ItemPopup();
+    mItemPopup = new ItemPopup;
     mItemPopup->setOpaque(false);
 
     ResourceManager *resman = ResourceManager::getInstance();
@@ -109,7 +110,10 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
             if (image)
             {
                 const std::string label =
-                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
+#ifdef EATHENA_SUPPORT
+                    item->isEquipped() ? "Eq." :
+#endif
+                    toString(item->getQuantity());
                 g->drawImage(image, itemX, itemY);
                 g->drawText(label, itemX + mBoxWidth / 2,
                             itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
@@ -233,7 +237,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 
     Item *item = player_node->getInventory()->findItem(itemId);
 
-    if (item)
+    if (item && inventoryWindow->isVisible())
     {
         if (item->getInfo().getName() != mItemPopup->getItemName())
             mItemPopup->setItem(item->getInfo());