Merge branch 'aethyra/master'

Conflicts:
	src/beingmanager.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/label.cpp
	src/gui/label.h
	src/gui/popup.cpp
	src/gui/popup.h
	src/gui/scrollarea.cpp
	src/gui/skin.cpp
	src/gui/skin.h
	src/gui/speechbubble.cpp
	src/gui/window.cpp
	src/gui/window.h
	src/localplayer.h
	src/main.cpp
	src/net/ea/playerhandler.cpp
	src/resources/ambientoverlay.h
	src/resources/dye.cpp
	src/resources/imagewriter.cpp
	src/resources/itemdb.cpp
	src/shopitem.cpp

1 files changed, 3 insertions, 8 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 7ac9051f..96500e88 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -144,7 +144,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             // Set color to the highligh color
             g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
             g->fillRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
-                                        BOX_WIDTH, BOX_HEIGHT));
+                                            BOX_WIDTH, BOX_HEIGHT));
         }
 
         // Set color black.
@@ -248,13 +248,8 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
             gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
                                  BOX_WIDTH, BOX_HEIGHT);
 
-            if (tRect.isPointInRect(x, y))
-            {
-                if (item)
-                {
-                    mSelected = i;
-                }
-            }
+            if (tRect.isPointInRect(x, y) && item)
+                mSelected = i;
         }
     }
     else if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)