Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 8 insertions, 9 deletions

diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 7bfbc88e..3404b0e3 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -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;
-        }
     }
 }
 
@@ -73,13 +70,15 @@ void ItemShortcut::useItem(int index)
         Item *item = player_node->getInventory()->findItem(mItems[index]);
         if (item && item->getQuantity())
         {
-            if (item->isEquipment()) {
-                if (item->isEquipped()) {
+            if (item->isEquipment())
+            {
+                if (item->isEquipped())
                     player_node->unequipItem(item);
-                } else {
+                else
                     player_node->equipItem(item);
-                }
-            } else {
+            }
+            else
+            {
                 player_node->useItem(item);
             }
         }