Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 9 insertions, 18 deletions

diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index fca0c72d..9e17f3da 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -64,8 +64,7 @@ ItemContainer::~ItemContainer()
     mSelImg->decRef();
 }
 
-void
-ItemContainer::logic()
+void ItemContainer::logic()
 {
     gcn::Widget::logic();
 
@@ -78,8 +77,7 @@ ItemContainer::logic()
     }
 }
 
-void
-ItemContainer::draw(gcn::Graphics *graphics)
+void ItemContainer::draw(gcn::Graphics *graphics)
 {
     int columns = getWidth() / gridWidth;
 
@@ -146,8 +144,7 @@ void ItemContainer::recalculateHeight()
         setHeight(height);
 }
 
-Item*
-ItemContainer::getSelectedItem()
+Item *ItemContainer::getSelectedItem()
 {
     refindSelectedItem(); // Make sure that we're still current
 
@@ -157,8 +154,7 @@ ItemContainer::getSelectedItem()
     return mInventory->getItem(mSelectedItemIndex);
 }
 
-void
-ItemContainer::selectNone()
+void ItemContainer::selectNone()
 {
     setSelectedItemIndex(NO_ITEM);
 }
@@ -166,15 +162,15 @@ ItemContainer::selectNone()
 void ItemContainer::refindSelectedItem()
 {
     if (mSelectedItemIndex != NO_ITEM) {
-	
+
         if (mInventory->getItem(mSelectedItemIndex) &&
             mInventory->getItem(mSelectedItemIndex)->getId() == mLastSelectedItemId)
             return; // we're already fine
-	
+
         // Otherwise ensure the invariant: we must point to an item of the specified last ID,
         // or nowhere at all.
 
-        for (int i = 0; i <= mMaxItems + mOffset; i++)
+        for (int i = 0; i <= mMaxItems + 1; i++)
             if (mInventory->getItem(i) &&
                 mInventory->getItem(i)->getId() == mLastSelectedItemId) {
                 mSelectedItemIndex = i;
@@ -198,7 +194,6 @@ void ItemContainer::setSelectedItemIndex(int index)
         newSelectedItemIndex = NO_ITEM;
     else
         newSelectedItemIndex = index;
-	
     if (mSelectedItemIndex != newSelectedItemIndex)
     {
         mSelectedItemIndex = newSelectedItemIndex;
@@ -212,8 +207,7 @@ void ItemContainer::setSelectedItemIndex(int index)
     }
 }
 
-void
-ItemContainer::distributeValueChangedEvent()
+void ItemContainer::distributeValueChangedEvent()
 {
     gcn::SelectionEvent event(this);
     std::list<gcn::SelectionListener*>::iterator i_end = mListeners.end();
@@ -225,8 +219,7 @@ ItemContainer::distributeValueChangedEvent()
     }
 }
 
-void
-ItemContainer::mousePressed(gcn::MouseEvent &event)
+void ItemContainer::mousePressed(gcn::MouseEvent &event)
 {
     int button = event.getButton();
 
@@ -243,8 +236,6 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         Item *item = mInventory->getItem(index);
 
         if (item)
-        {
             itemShortcut->setItemSelected(item->getId());
-        }
     }
 }