Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0

1 files changed, 13 insertions, 11 deletions

diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index a32e50e0..babe3dfb 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemshortcut.h"
@@ -64,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);
     }
 }
 
@@ -81,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);
+            }
+        }
     }
 }