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, 12 insertions, 10 deletions

diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 92837603..eef9ae33 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -74,12 +74,15 @@ DropDown::DropDown(gcn::ListModel *listModel, gcn::ScrollArea *scrollArea,
         int gridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
-                skin.grid[a] = boxBorder->getSubImage(
-                        gridx[x], gridy[y],
-                        gridx[x + 1] - gridx[x] + 1,
-                        gridy[y + 1] - gridy[y] + 1);
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                skin.grid[a] = boxBorder->getSubImage(gridx[x], gridy[y], 
+                                                      gridx[x + 1] - 
+                                                      gridx[x] + 1,
+                                                      gridy[y + 1] - 
+                                                      gridy[y] + 1);
                 skin.grid[a]->setAlpha(mAlpha);
                 a++;
             }
@@ -108,16 +111,15 @@ DropDown::~DropDown()
 
 void DropDown::draw(gcn::Graphics* graphics)
 {
+    if (!isVisible())
+        return;
+
     int h;
 
     if (mDroppedDown)
-    {
         h = mFoldedUpHeight;
-    }
     else
-    {
         h = getHeight();
-    }
 
     if (config.getValue("guialpha", 0.8) != mAlpha)
     {