Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 13 insertions, 19 deletions

diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 74609fa1..f149266b 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -38,34 +38,28 @@ ShortcutContainer::ShortcutContainer():
 void ShortcutContainer::widgetResized(const gcn::Event &event)
 {
     mGridWidth = getWidth() / mBoxWidth;
+
     if (mGridWidth < 1)
-    {
         mGridWidth = 1;
-    }
-
-    setHeight((mMaxItems / mGridWidth +
-                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 
     mGridHeight = getHeight() / mBoxHeight;
+
     if (mGridHeight < 1)
-    {
         mGridHeight = 1;
-    }
+
+    setHeight((mMaxItems / mGridWidth +
+              (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 }
 
 int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
-    const gcn::Rectangle tRect = gcn::Rectangle(
-        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-    if (!tRect.isPointInRect(pointX, pointY))
-    {
-        return -1;
-    }
-    const int index = ((pointY / mBoxHeight) * mGridWidth) +
-        pointX / mBoxWidth;
-    if (index >= mMaxItems)
-    {
-        return -1;
-    }
+    const gcn::Rectangle tRect = gcn::Rectangle(0, 0, mGridWidth * mBoxWidth,
+                                                mGridHeight * mBoxHeight);
+
+    int index = ((pointY / mBoxHeight) * mGridWidth) + pointX / mBoxWidth;
+
+    if (!tRect.isPointInRect(pointX, pointY) || index >= mMaxItems)
+        index = -1;
+
     return index;
 }