Added ability to add equipment to the shurtcut bar

Patch by Nikos, with some improvements.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 5a92e216..babe3dfb 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -62,14 +62,8 @@ void ItemShortcut::save()
 {
     for (int i = 0; i < SHORTCUT_ITEMS; i++)
     {
-        if (mItems[i])
-        {
-            config.setValue("shortcut" + toString(i), mItems[i]);
-        }
-        else
-        {
-            config.setValue("shortcut" + toString(i), -1);
-        }
+        const int itemId = mItems[i] ? mItems[i] : -1;
+        config.setValue("shortcut" + toString(i), itemId);
     }
 }
 
@@ -79,6 +73,16 @@ void ItemShortcut::useItem(int index)
     {
         Item *item = player_node->getInventory()->findItem(mItems[index]);
         if (item && item->getQuantity())
-            player_node->useItem(item);
+        {
+            if (item->isEquipment()) {
+                if (item->isEquipped()) {
+                    player_node->unequipItem(item);
+                } else {
+                    player_node->equipItem(item);
+                }
+            } else {
+                player_node->useItem(item);
+            }
+        }
     }
 }