Re-enabled non-functional item shortcut window, planned to be fixed for 0.0.25

(reverted change 3811). Somehow seems it's not drawing anything, not sure why.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index c73d25f3..ad0674f4 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -29,7 +29,7 @@
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
-//#include "../itemshortcut.h"
+#include "../itemshortcut.h"
 #include "../log.h"
 
 #include "../resources/image.h"
@@ -197,7 +197,7 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         int my = event.getY();
         int index = mx / gridWidth + ((my / gridHeight) * columns) + 2;
 
-        //itemShortcut->setItemSelected(NULL);
+        itemShortcut->setItemSelected(NULL);
         // Fix for old server, it should be: if (index >= mMaxItems)
         if (index > mMaxItems + 1)
         {
@@ -206,9 +206,9 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         }
         Item *item = mInventory->getItem(index);
         setSelectedItem(item);
-        //if (!item->isEquipment())
-        //{
-        //    itemShortcut->setItemSelected(item);
-        //}
+        if (!item->isEquipment())
+        {
+            itemShortcut->setItemSelected(item);
+        }
     }
 }
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index e4d101c8..2043b7d1 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -35,7 +35,7 @@ extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
-//extern Window *itemShortcutWindow;
+extern Window *itemShortcutWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
@@ -62,7 +62,7 @@ MenuWindow::MenuWindow():
         "Equipment",
         "Inventory",
         "Skills",
-//        "Shortcut",
+        "Shortcut",
         "Setup",
         0
     };
@@ -107,10 +107,10 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
     {
         window = skillDialog;
     }
-    //else if (event.getId() == "Shortcut")
-    //{
-    //    window = itemShortcutWindow;
-    //}
+    else if (event.getId() == "Shortcut")
+    {
+        window = itemShortcutWindow;
+    }
     else if (event.getId() == "Setup")
     {
         window = setupWindow;