1 files changed, 23 insertions, 21 deletions

diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index bea14864..2dea8c56 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -1,31 +1,31 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  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
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "itemshortcut.h"
-
+#include "configuration.h"
+#include "inventory.h"
 #include "item.h"
+#include "itemshortcut.h"
 #include "localplayer.h"
-#include "configuration.h"
 
-#include "utils/tostring.h"
+#include "utils/stringutils.h"
 
 ItemShortcut::ItemShortcut *itemShortcut;
 
@@ -33,9 +33,8 @@ ItemShortcut::ItemShortcut():
     mItemSelected(-1)
 {
     for (int i = 0; i < SHORTCUT_ITEMS; i++)
-    {
         mItems[i] = -1;
-    }
+
     load();
 }
 
@@ -51,9 +50,7 @@ void ItemShortcut::load()
         int itemId = (int) config.getValue("shortcut" + toString(i), -1);
 
         if (itemId != -1)
-        {
             mItems[i] = itemId;
-        }
     }
 }
 
@@ -70,21 +67,26 @@ void ItemShortcut::useItem(int index)
 {
     if (mItems[index])
     {
-        Item *item = player_node->searchForItem(mItems[index]);
+        Item *item = player_node->getInventory()->findItem(mItems[index]);
         if (item && item->getQuantity())
         {
-            // TODO: Fix this (index vs. pointer mismatch)
-            /*
-            if (item->isEquipment()) {
-                if (item->isEquipped()) {
+            if (item->isEquipment())
+            {
+#ifdef EATHENA_SUPPORT
+                if (item->isEquipped())
                     player_node->unequipItem(item);
-                } else {
+                else
+#endif
                     player_node->equipItem(item);
-                }
-            } else {
+            }
+            else
+            {
+#ifdef TMWSERV_SUPPORT
+                player_node->useItem(item->getInvIndex());
+#else
                 player_node->useItem(item);
+#endif
             }
-            */
         }
     }
 }