Merge branch 'aethyra/master'

Conflicts:
	data/graphics/images/login_wallpaper.png
	src/being.cpp
	src/beingmanager.cpp
	src/engine.cpp
	src/game.cpp
	src/gui/buysell.cpp
	src/gui/buysell.h
	src/gui/gui.h
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h
	src/gui/npcstringdialog.cpp
	src/gui/sell.cpp
	src/gui/shop.cpp
	src/gui/table.cpp
	src/net/beinghandler.cpp
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/npc.cpp
	src/npc.h
	src/shopitem.cpp
	src/shopitem.h
	src/utils/stringutils.cpp
	src/utils/stringutils.h
	src/utils/trim.h

1 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 1fd088ce..68f36329 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -401,25 +401,21 @@ void GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
     else if (key.getValue() == gcn::Key::UP)
     {
         setSelectedRow(mSelectedRow - 1);
-
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::DOWN)
     {
         setSelectedRow(mSelectedRow + 1);
-
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::LEFT)
     {
         setSelectedColumn(mSelectedColumn - 1);
-
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::RIGHT)
     {
         setSelectedColumn(mSelectedColumn + 1);
-
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::HOME)
@@ -459,7 +455,7 @@ void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
 {
     if (isFocused())
     {
-        if (getSelectedRow() >= 0 )
+        if (getSelectedRow() > 0 || (getSelectedRow() == 0 && mWrappingEnabled))
         {
             setSelectedRow(getSelectedRow() - 1);
         }