Mostly whitespace fixes

Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".

65 files changed, 627 insertions, 623 deletions

diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 538c14de..7c2000fd 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -71,11 +71,13 @@ A: There are a lot of ways:
      channel: #themanaworld @ irc.freenode.net.
 
    - You can donate money. Follow the link on the project page:
-	http://sourceforge.net/projects/themanaworld.
+
+        http://sourceforge.net/projects/themanaworld/
 
    - You can be a beta tester. Just play The Mana World and report every
      error to the tracker. Read for more infos on the project page:
-	http://themanaworld.org.
+
+        http://themanaworld.org/
 
    - Play with The Mana World: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 1a1e527f..fb758c43 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -44,7 +44,7 @@ This tutorial is written and tested with the latest beta version, which is
 the old stable version, so don't do that. Get Dev-C++ here:
 
   http://www.bloodshed.net/
- 
+
 After you have fetched it, simply run and install as prompted.
 
 
@@ -124,7 +124,7 @@ start compilition with Excute -> Compile. A file called tmw.exe should appear
 in the same directory as where you opened the .dev from.
 
 Before you can actually run the executable be sure to copy over the following
-DLLs from your Dev-Cpp/dll directory to the directory containing tmw.exe (or 
+DLLs from your Dev-Cpp/dll directory to the directory containing tmw.exe (or
 alternatively into your c:\windows\system\ for a more universal solution):
 
  SDL.dll
diff --git a/docs/packages.txt b/docs/packages.txt
index 40ade7f9..3d794a1b 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -125,27 +125,27 @@ the data while working on the next package to be released.
 
 The resource management technique is critical to the overall success of the
 package management system as a whole.  Resources are loaded at runtime as they
-are needed, and unloaded as they become unused.  In order to ensure the 
-autonomous functioning of this process reference counting is the agreed upon 
-technique for managing loaded resources in TMW.  
+are needed, and unloaded as they become unused.  In order to ensure the
+autonomous functioning of this process reference counting is the agreed upon
+technique for managing loaded resources in TMW.
 
-For those unfamiliar with the practice of reference counting, it involves 
+For those unfamiliar with the practice of reference counting, it involves
 every resource object having a variable containing the number of references to
 the object. When a reference is added the function addRef() is called and when
-it is removed the function release() is called. When the reference count 
-reaches zero the object will automatically delete itself, thus handling the 
+it is removed the function release() is called. When the reference count
+reaches zero the object will automatically delete itself, thus handling the
 cleanup of resources.
 
 Reference counting will form the core of the resource management system.  Each
 resource object will have the functionality of a reference counted object. The
-resource manager will hold ResourceEntry objects.  The resource entry object 
-contains a pointer to the resource as well as the location of the path of the 
+resource manager will hold ResourceEntry objects.  The resource entry object
+contains a pointer to the resource as well as the location of the path of the
 file the resource was loaded from.  This would look something like:
 
   /**
    * A generic reference counted resource object.
    */
-  class Resource { 
+  class Resource {
       public:
           /**
            * Loads the resource from the specified path.
@@ -158,17 +158,17 @@ file the resource was loaded from.  This would look something like:
            * Increments the reference counted of this object.
            */
           void addRef() { ++referenceCount; }
- 
+
           /**
            * Decrements the reference count and deletes the object
            * if no references are left.
            * @return <code>true</code> if the object was deleted
            * <code>false</code> otherwise.
            */
-          void release() { 
+          void release() {
               --referenceCount;
 
-              if(!referenceCount)
+              if (!referenceCount)
               {
                   delete this;
                   return true;
@@ -183,14 +183,14 @@ file the resource was loaded from.  This would look something like:
   /**
    * A resource entry descriptor.
    */
-  struct ResourceEntry { 
-      Resource*   resource; 
-      std::string filePath; 
+  struct ResourceEntry {
+      Resource*   resource;
+      std::string filePath;
   };
   ...
 
 The resource manager would then hold a mapping containing the resource entry as
-well as the string defining its resource identification path. The resource 
+well as the string defining its resource identification path. The resource
 manager would thus look something like this:
 
   /**
diff --git a/src/Makefile.am b/src/Makefile.am
index a1085d0a..84f33daf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = tmw
 tmw_SOURCES = gui/widgets/dropdown.cpp \
-              gui/widgets/dropdown.h \
+	      gui/widgets/dropdown.h \
 	      gui/widgets/layout.cpp \
 	      gui/widgets/layout.h \
 	      gui/widgets/layouthelper.cpp \
@@ -17,8 +17,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
 	      gui/button.h \
-              gui/buttonbox.cpp \
-              gui/buttonbox.h \
+	      gui/buttonbox.cpp \
+	      gui/buttonbox.h \
 	      gui/buy.cpp \
 	      gui/buy.h \
 	      gui/buysell.cpp \
@@ -189,8 +189,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      net/network.h \
 	      net/npchandler.cpp \
 	      net/npchandler.h \
-              net/partyhandler.cpp \
-              net/partyhandler.h \
+	      net/partyhandler.cpp \
+	      net/partyhandler.h \
 	      net/playerhandler.cpp \
 	      net/playerhandler.h \
 	      net/protocol.cpp \
@@ -274,7 +274,7 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      engine.h \
 	      equipment.cpp \
 	      equipment.h \
-              extensions.h \
+	      extensions.h \
 	      floor_item.cpp \
 	      floor_item.h \
 	      flooritemmanager.cpp \
@@ -319,8 +319,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      particleemitter.cpp \
 	      particleemitter.h \
 	      particleemitterprop.h \
-              party.cpp \
-              party.h \
+	      party.cpp \
+	      party.h \
 	      player.cpp \
 	      player.h \
 	      player_relations.cpp \
@@ -328,8 +328,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      position.cpp \
 	      position.h \
 	      properties.h \
-              recorder.cpp \
-              recorder.h \
+	      recorder.cpp \
+	      recorder.h \
 	      serverinfo.h \
 	      shopitem.cpp \
 	      shopitem.h \
diff --git a/src/being.cpp b/src/being.cpp
index 63c60390..dadc7357 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -44,7 +44,7 @@
 #include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
-#include "utils/gettext.h"  
+#include "utils/gettext.h"
 #include "utils/tostring.h"
 #include "utils/xml.h"
 
@@ -199,7 +199,7 @@ void Being::setSpeech(const std::string &text, Uint32 time)
     while (start != std::string::npos && end != std::string::npos)
     {
         // Catch multiple embeds and ignore them so it doesn't crash the client.
-        while ((mSpeech.find('[', start + 1) != std::string::npos) && 
+        while ((mSpeech.find('[', start + 1) != std::string::npos) &&
                (mSpeech.find('[', start + 1) < end))
         {
             start = mSpeech.find('[', start + 1);
@@ -321,7 +321,7 @@ void Being::setAction(Action action)
             {
                 currentAction = mEquippedWeapon->getAttackType();
             }
-            else 
+            else
             {
                 currentAction = ACTION_ATTACK;
             }
@@ -390,11 +390,11 @@ SpriteDirection Being::getSpriteDirection() const
     {
         dir = DIRECTION_RIGHT;
     }
-    else 
+    else
     {
          dir = DIRECTION_LEFT;
     }
- 
+
     return dir;
 }
 
@@ -535,10 +535,10 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
 
         mSpeechBubble->setCaption(mName, mNameColor);
 
-        // Not quite centered, but close enough. However, it's not too important to get 
-        // it right right now, as it doesn't take bubble collision into account yet. 
+        // Not quite centered, but close enough. However, it's not too important to get
+        // it right right now, as it doesn't take bubble collision into account yet.
         mSpeechBubble->setText(mSpeech);
-        mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - 
+        mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 -
                                         (mSpeechBubble->getNumRows()*14));
         mSpeechBubble->setVisible(true);
     }
@@ -622,7 +622,7 @@ void Being::setStatusEffect(int index, bool active)
 int Being::getOffset(char pos, char neg) const
 {
     // Check whether we're walking in the requested direction
-    if (mAction != WALK ||  !(mDirection & (pos | neg))) 
+    if (mAction != WALK ||  !(mDirection & (pos | neg)))
     {
         return 0;
     }
@@ -631,13 +631,13 @@ int Being::getOffset(char pos, char neg) const
 
     // We calculate the offset _from_ the _target_ location
     offset -= 32;
-    if (offset > 0) 
+    if (offset > 0)
     {
         offset = 0;
     }
 
     // Going into negative direction? Invert the offset.
-    if (mDirection & pos) 
+    if (mDirection & pos)
     {
         offset = -offset;
     }
@@ -650,11 +650,11 @@ int Being::getWidth() const
     if (mSprites[BASE_SPRITE])
     {
         const int width = mSprites[BASE_SPRITE]->getWidth() > DEFAULT_WIDTH ?
-                                   mSprites[BASE_SPRITE]->getWidth() : 
+                                   mSprites[BASE_SPRITE]->getWidth() :
                                    DEFAULT_WIDTH;
         return width;
     }
-    else 
+    else
     {
         return DEFAULT_WIDTH;
     }
@@ -666,11 +666,11 @@ int Being::getHeight() const
     if (mSprites[BASE_SPRITE])
     {
         const int height = mSprites[BASE_SPRITE]->getHeight() > DEFAULT_HEIGHT ?
-                                   mSprites[BASE_SPRITE]->getHeight() : 
+                                   mSprites[BASE_SPRITE]->getHeight() :
                                    DEFAULT_HEIGHT;
         return height;
     }
-    else 
+    else
     {
         return DEFAULT_HEIGHT;
     }
diff --git a/src/being.h b/src/being.h
index 9e207448..e8badaed 100644
--- a/src/being.h
+++ b/src/being.h
@@ -115,7 +115,7 @@ class Being : public Sprite
         Uint16 mJob;            /**< Job (player job, npc, monster, ) */
         Uint16 mX, mY;          /**< Tile coordinates */
         Action mAction;          /**< Action the being is performing */
-	Uint16 mFrame;
+        Uint16 mFrame;
         Uint16 mWalkTime;
         Uint8 mEmotion;         /**< Currently showing emotion */
         Uint8 mEmotionTime;     /**< Time until emotion disappears */
@@ -492,7 +492,8 @@ class Being : public Sprite
          */
         int getOffset(char pos, char neg) const;
 
-        bool mMustResetParticles;	/**< Reset particle status effects on next redraw? */
+        /** Reset particle status effects on next redraw? */
+        bool mMustResetParticles;
 
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 14b932d3..8e029cf0 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -71,13 +71,13 @@ bool EffectManager::trigger(int id, Being* being)
         {
             printf("Found effect, playing it");
             rValue = true;
-            if((*i).GFX != "")
+            if (!(*i).GFX.empty())
             {
                 Particle *selfFX;
                 selfFX = particleEngine->addEffect((*i).GFX, 0, 0);
                 being->controlParticle(selfFX);
             }
-            if((*i).SFX != "")
+            if (!(*i).SFX.empty())
                 sound.playSfx((*i).SFX);
             break;
         }
@@ -94,9 +94,9 @@ bool EffectManager::trigger(int id, int x, int y)
         {
             printf("Found effect, playing it");
             rValue = true;
-            if((*i).GFX != "")
+            if (!(*i).GFX.empty())
                 particleEngine->addEffect((*i).GFX, x, y);
-            if((*i).SFX != "")
+            if (!(*i).SFX.empty())
                 sound.playSfx((*i).SFX);
             break;
         }
diff --git a/src/engine.cpp b/src/engine.cpp
index 29b8921a..50158c24 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -108,7 +108,7 @@ void Engine::changeMap(const std::string &mapPath)
                          map_path.c_str());
         }
 
-        // How many pixels equal one tile. .5 (which is the TMW default) is 
+        // How many pixels equal one tile. .5 (which is the TMW default) is
         // 2 tiles to a pixel, while 1 is 1 tile to 1 pixel
         if (newMap->hasProperty("minimapproportion"))
              minimap->setProportion(atof(
diff --git a/src/equipment.cpp b/src/equipment.cpp
index d5e0f656..743c0a90 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -37,6 +37,5 @@ void Equipment::setEquipment(int index, int inventoryIndex)
     mEquipment[index] = inventoryIndex;
     Item* item = player_node->getInventory()->getItem(inventoryIndex);
     if (item)
-    	item->setEquipped(true);
+        item->setEquipped(true);
 }
-
diff --git a/src/game.cpp b/src/game.cpp
index 03d68a80..0477c4f1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -181,11 +181,11 @@ Uint32 nextSecond(Uint32 interval, void *param)
 
 int get_elapsed_time(int start_time)
 {
-    if (start_time <= tick_time) 
+    if (start_time <= tick_time)
     {
         return (tick_time - start_time) * 10;
     }
-    else 
+    else
     {
         return (tick_time + (MAX_TIME - start_time)) * 10;
     }
@@ -496,7 +496,7 @@ void Game::handleInput()
         {
             gcn::Window *requestedWindow = NULL;
 
-            if (setupWindow->isVisible() && 
+            if (setupWindow->isVisible() &&
                     keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
             {
                 keyboard.setNewKey((int) event.key.keysym.sym);
@@ -622,9 +622,9 @@ void Game::handleInput()
                     break;
                // Quitting confirmation dialog
                case SDLK_ESCAPE:
-                    if (!exitConfirm) 
+                    if (!exitConfirm)
                     {
-                        exitConfirm = new ConfirmDialog( _("Quit"), 
+                        exitConfirm = new ConfirmDialog( _("Quit"),
                                                          _("Are you sure you "
                                                            "want to quit?"));
                         exitConfirm->addActionListener(&exitListener);
@@ -652,7 +652,7 @@ void Game::handleInput()
                              i <= KeyboardConfig::KEY_SHORTCUT_12;
                              i++)
                     {
-                        if (tKey == i && !used) 
+                        if (tKey == i && !used)
                         {
                             itemShortcut->useItem(
                                           i - KeyboardConfig::KEY_SHORTCUT_1);
@@ -823,7 +823,7 @@ void Game::handleInput()
         if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
            (joystick && joystick->buttonPressed(0)))
         {
-            Being *target = beingManager->findNearestLivingBeing(x, y, 20, 
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20,
                                                                  Being::MONSTER);
 
             bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
@@ -851,7 +851,7 @@ void Game::handleInput()
         }
 
         // Target the nearest player if 'q' is pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && 
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) &&
                 !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
@@ -860,8 +860,8 @@ void Game::handleInput()
         }
 
         // Target the nearest monster if 'a' pressed
-        if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || 
-                    (joystick && joystick->buttonPressed(3))) && 
+        if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ||
+                    (joystick && joystick->buttonPressed(3))) &&
                 !keyboard.isKeyActive(keyboard.KEY_TARGET))
         {
             Being *target = beingManager->findNearestLivingBeing(
@@ -871,7 +871,7 @@ void Game::handleInput()
         }
 
         // Target the nearest npc if 'n' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) &&
                 !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(
diff --git a/src/game.h b/src/game.h
index 4f512d97..26ccc90b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef GAME_
-#define GAME_
+#ifndef GAME_H
+#define GAME_H
 
 #include <iosfwd>
 #include <memory>
@@ -40,35 +40,35 @@ extern volatile int tick_time;
 class Game : public ConfigListener
 {
     public:
-	Game(Network *network);
-	~Game();
+        Game(Network *network);
+        ~Game();
 
-	void logic();
+        void logic();
 
-	void handleInput();
+        void handleInput();
 
-	void optionChanged(const std::string &name);
+        void optionChanged(const std::string &name);
 
     private:
-	Network *mNetwork;
-
-	/** Used to determine whether to draw the next frame. */
-	int mDrawTime;
-
-	/** The minimum frame time (used for frame limiting). */
-	int mMinFrameTime;
-
-	typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
-	MessageHandlerPtr mBeingHandler;
-	MessageHandlerPtr mBuySellHandler;
-	MessageHandlerPtr mChatHandler;
-	MessageHandlerPtr mEquipmentHandler;
-	MessageHandlerPtr mInventoryHandler;
-	MessageHandlerPtr mItemHandler;
-	MessageHandlerPtr mNpcHandler;
-	MessageHandlerPtr mPlayerHandler;
-	MessageHandlerPtr mSkillHandler;
-	MessageHandlerPtr mTradeHandler;
+        Network *mNetwork;
+
+        /** Used to determine whether to draw the next frame. */
+        int mDrawTime;
+
+        /** The minimum frame time (used for frame limiting). */
+        int mMinFrameTime;
+
+        typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
+        MessageHandlerPtr mBeingHandler;
+        MessageHandlerPtr mBuySellHandler;
+        MessageHandlerPtr mChatHandler;
+        MessageHandlerPtr mEquipmentHandler;
+        MessageHandlerPtr mInventoryHandler;
+        MessageHandlerPtr mItemHandler;
+        MessageHandlerPtr mNpcHandler;
+        MessageHandlerPtr mPlayerHandler;
+        MessageHandlerPtr mSkillHandler;
+        MessageHandlerPtr mTradeHandler;
 };
 
 /**
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 6fd0482a..dbecf72b 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -101,7 +101,7 @@ void BrowserBox::addRow(const std::string &row)
             newRow += "##<" + bLink.caption;
 
             tmp.erase(0, idx3 + 2);
-            if(tmp != "")
+            if (tmp != "")
             {
                 newRow += "##>";
             }
diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp
index d29f3c58..44d65f58 100644
--- a/src/gui/buttonbox.cpp
+++ b/src/gui/buttonbox.cpp
@@ -23,13 +23,13 @@
 #include "buttonbox.h"
 
 ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt,
-		     ButtonBoxListener *listener) :
-		     Window(title),
-		     mListener(listener)
+                     ButtonBoxListener *listener) :
+    Window(title),
+    mListener(listener)
 {
     Button *button = new Button(buttonTxt, "activate", this);
     setContentSize(button->getWidth() + 10,
-		   button->getHeight() + 10);
+                   button->getHeight() + 10);
     button->setPosition(5, 5);
     add(button);
 }
@@ -38,6 +38,6 @@ void ButtonBox::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "activate")
     {
-	mListener->buttonBoxRespond();
+        mListener->buttonBoxRespond();
     }
 }
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 6d0e46b6..91dfad34 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -33,37 +33,35 @@
 class ButtonBoxListener
 {
     public:
-
-	/*
-	 * function that ButtonBox calls when the button has been pressed
-	 */
-	virtual void buttonBoxRespond() = 0;
+        /*
+         * function that ButtonBox calls when the button has been pressed
+         */
+        virtual void buttonBoxRespond() = 0;
 };
 
 class ButtonBox : public Window, public gcn::ActionListener
 {
     public:
+        /*
+         * Constructor.
+         *
+         * @param title is the text that appears at the top of the box
+         * @param buttonTxt is the text that appears on the button
+         * @param listener points to the class that should respond to the
+         *                 button press
+         */
+        ButtonBox(const std::string &title, const std::string &buttonTxt,
+                  ButtonBoxListener *listener);
 
-	/*
-	 * Constructor
-	 *
-	 * @param title is the text that appears at the top of the box
-	 * @param buttonTxt is the text that appears on the button
-	 * @param listener points to the class that should respond to the
-	 *                 button press
-	 */
-	ButtonBox(const std::string &title, const std::string &buttonTxt,
-		  ButtonBoxListener *listener);
-
-	/*
-	 * called when the button is pressed
-	 *
-	 * @param event is the event that is generated
-	 */
-	void action(const gcn::ActionEvent &event);
+        /*
+         * called when the button is pressed
+         *
+         * @param event is the event that is generated
+         */
+        void action(const gcn::ActionEvent &event);
 
     private:
-
-	ButtonBoxListener *mListener;
+        ButtonBoxListener *mListener;
 };
+
 #endif
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index e556dfa0..dcb05aa1 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -91,8 +91,8 @@ CharSelectDialog::CharSelectDialog(Network *network,
     mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
     mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
 
-    const std::string tempString = getFont()->getWidth(_("New")) < 
-                                   getFont()->getWidth(_("Delete")) ? 
+    const std::string tempString = getFont()->getWidth(_("New")) <
+                                   getFont()->getWidth(_("Delete")) ?
                                    _("Delete") : _("New");
 
     mPreviousButton = new Button(_("Previous"), "previous", this);
@@ -228,7 +228,7 @@ bool CharSelectDialog::selectByName(const std::string &name)
     unsigned int oldPos = mCharInfo->getPos();
 
     mCharInfo->select(0);
-    do 
+    do
     {
         LocalPlayer *player = mCharInfo->getEntry();
 
@@ -306,15 +306,15 @@ CharCreateDialog::~CharCreateDialog()
 void CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     int numberOfColors = ColorDB::size();
-    if (event.getId() == "create") 
+    if (event.getId() == "create")
     {
-        if (getName().length() >= 4) 
+        if (getName().length() >= 4)
         {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
             attemptCharCreate();
         }
-        else 
+        else
         {
             new OkDialog("Error",
                     "Your name needs to be at least 4 characters.", this);
@@ -323,18 +323,18 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "cancel")
         scheduleDelete();
     else if (event.getId() == "nextcolor")
-        mPlayer->setHairStyle(mPlayer->getHairStyle(), 
+        mPlayer->setHairStyle(mPlayer->getHairStyle(),
                              (mPlayer->getHairColor() + 1) % numberOfColors);
     else if (event.getId() == "prevcolor")
-        mPlayer->setHairStyle(mPlayer->getHairStyle(), 
-                             (mPlayer->getHairColor() + numberOfColors - 1) % 
+        mPlayer->setHairStyle(mPlayer->getHairStyle(),
+                             (mPlayer->getHairColor() + numberOfColors - 1) %
                               numberOfColors);
     else if (event.getId() == "nextstyle")
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, 
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1,
                               mPlayer->getHairColor());
     else if (event.getId() == "prevstyle")
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + 
-                              mPlayer->getNumOfHairstyles() - 1, 
+        mPlayer->setHairStyle(mPlayer->getHairStyle() +
+                              mPlayer->getNumOfHairstyles() - 1,
                               mPlayer->getHairColor());
 }
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index c9c3e9bc..4fb92ac5 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -75,7 +75,7 @@ Window(""), mNetwork(network), mTmpVisible(false)
     mTextOutput->setLinkHandler(mItemLinkHandler);
 
     mScrollArea = new ScrollArea(mTextOutput);
-    mScrollArea->setPosition(mScrollArea->getFrameSize(), 
+    mScrollArea->setPosition(mScrollArea->getFrameSize(),
                              mScrollArea->getFrameSize());
     mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
                                  gcn::ScrollArea::SHOW_ALWAYS);
@@ -144,7 +144,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     }
 
     std::string lineColor = "##C";
-    switch (own) 
+    switch (own)
     {
         case BY_GM:
             if (tmp.nick.empty())
@@ -224,7 +224,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
     if (mScrollArea->getVerticalScrollAmount() ==
-        mScrollArea->getVerticalMaxScroll()) 
+        mScrollArea->getVerticalMaxScroll())
     {
         mTextOutput->addRow(line);
         mScrollArea->setVerticalScrollAmount(mScrollArea->
@@ -345,7 +345,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
      * those if elses should be replaced by protocol calls */
 
     // Send party message
-    if (msg.at(0) == mPartyPrefix) 
+    if (msg.at(0) == mPartyPrefix)
     {
         msg.erase(0, 1);
         std::size_t length = msg.length() + 1;
@@ -371,7 +371,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         if (end != std::string::npos)
         {
             // Catch multiple embeds and ignore them so it doesn't crash the client.
-            while ((msg.find('[', start + 1) != std::string::npos) && 
+            while ((msg.find('[', start + 1) != std::string::npos) &&
                    (msg.find('[', start + 1) < end))
             {
                 start = msg.find('[', start + 1);
@@ -403,7 +403,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
     }
 
     // Prepare ordinary message
-    if (msg.substr(0, 1) != "/") 
+    if (msg.substr(0, 1) != "/")
     {
         msg = nick + " : " + msg;
 
@@ -431,14 +431,14 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         trim(msg);
     }
 
-    if (command == "announce") 
+    if (command == "announce")
     {
         MessageOut outMsg(mNetwork);
         outMsg.writeInt16(0x0099);
         outMsg.writeInt16(msg.length() + 4);
         outMsg.writeString(msg, msg.length());
     }
-    else if (command == "help") 
+    else if (command == "help")
     {
         msg.erase(0, 6);
         trim(msg);
@@ -492,16 +492,16 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
 
         msg = msg.substr(0, 1);
 
-        if (msg == "1" || 
-            msg == "y" || msg == "Y" || 
+        if (msg == "1" ||
+            msg == "y" || msg == "Y" ||
             msg == "t" || msg == "T")
         {
             chatLog(_("Return now toggles chat."), BY_SERVER);
             mReturnToggles = true;
             return;
         }
-        else if (msg == "0" || 
-                 msg == "n" || msg == "N" || 
+        else if (msg == "0" ||
+                 msg == "n" || msg == "N" ||
                  msg == "f" || msg == "F")
         {
             chatLog(_("Message now closes chat."), BY_SERVER);
@@ -800,7 +800,7 @@ void ChatWindow::party(const std::string & command, const std::string & rest)
 void ChatWindow::help(const std::string & msg1, const std::string & msg2)
 {
     chatLog(_("-- Help --"), BY_SERVER);
-    if (msg1 == "") 
+    if (msg1 == "")
     {
         chatLog(_("/announce: Global announcement (GM only)"), BY_SERVER);
         chatLog(_("/clear: Clears this window"), BY_SERVER);
@@ -839,25 +839,25 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
         chatLog(_("Command: /help <command>"), BY_SERVER);
         chatLog(_("This command displays help on <command>."), BY_SERVER);
     }
-    else if (msg1 == "party") 
+    else if (msg1 == "party")
     {
         mParty->help(msg2);
     }
-    else if (msg1 == "present") 
+    else if (msg1 == "present")
     {
         chatLog(_("Command: /present"), BY_SERVER);
         chatLog(_("This command gets a list of players within hearing and "
                   "sends it to either the record log if recording, or the chat "
                   "log otherwise."), BY_SERVER);
     }
-    else if (msg1 == "record") 
+    else if (msg1 == "record")
     {
         mRecorder->help(msg2);
     }
-    else if (msg1 == "toggle") 
+    else if (msg1 == "toggle")
     {
         chatLog(_("Command: /toggle <state>"), BY_SERVER);
-        chatLog(_("This command sets whether the return key should toggle the" 
+        chatLog(_("This command sets whether the return key should toggle the"
                   "chat log, or whether the chat log turns off automatically."),
                   BY_SERVER);
         chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to "
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 569fd93f..ce0a8a68 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -53,7 +53,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         // 15 == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
         setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + noButton->getHeight());
-        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 
+        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
                                                3 + (numRows * 14)));
     }
     else
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 1fb2b601..40496381 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -120,7 +120,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
                 graphics->drawText(toString(item->getQuantity()),
                                    mEquipBox[i].posX + (BOX_WIDTH / 2),
                                    mEquipBox[i].posY - getFont()->getHeight(),
-                                   gcn::Graphics::CENTER); 
+                                   gcn::Graphics::CENTER);
             }
         }
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 58c13910..3b868610 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -59,11 +59,11 @@ InventoryWindow::InventoryWindow(int invSize):
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 375, 300);
 
-    std::string longestUseString = getFont()->getWidth(_("Equip")) > 
+    std::string longestUseString = getFont()->getWidth(_("Equip")) >
                                    getFont()->getWidth(_("Use")) ?
                                    _("Equip") : _("Use");
 
-    if (getFont()->getWidth(longestUseString) < 
+    if (getFont()->getWidth(longestUseString) <
         getFont()->getWidth(_("Unequip")))
     {
         longestUseString = _("Unequip");
@@ -140,7 +140,7 @@ void InventoryWindow::logic()
         // Adjust progress bars
         mSlotsBar->setProgress((float)
                player_node->getInventory()->getNumberOfSlotsUsed() / mMaxSlots);
-        mWeightBar->setProgress((float) player_node->mTotalWeight / 
+        mWeightBar->setProgress((float) player_node->mTotalWeight /
                                         player_node->mMaxWeight);
 
         mSlotsBar->setText(strprintf("%s/%d", mUsedSlots.c_str(), mMaxSlots));
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 1fa76343..1905e820 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -44,7 +44,7 @@ namespace gcn {
  *
  * \ingroup GUI
  */
-class ItemContainer : public gcn::Widget, 
+class ItemContainer : public gcn::Widget,
                       public gcn::MouseListener,
                       public gcn::WidgetListener
 {
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 8235d640..2d3797c9 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -114,7 +114,7 @@ void ItemPopup::setItem(const ItemInfo &item)
     mItemName->setCaption(item.getName());
     mItemDesc->setTextWrapped(item.getDescription());
     mItemEffect->setTextWrapped(item.getEffect());
-    mItemWeight->setTextWrapped(_("Weight: ") + toString(item.getWeight()) + 
+    mItemWeight->setTextWrapped(_("Weight: ") + toString(item.getWeight()) +
                                 _(" grams"));
 
     int numRowsDesc = mItemDesc->getNumberOfRows();
@@ -130,22 +130,22 @@ void ItemPopup::setItem(const ItemInfo &item)
     mItemWeightScroll->setDimension(gcn::Rectangle(2, 0, 196,
                                     numRowsWeight * getFont()->getHeight()));
 
-    if(item.getEffect() == "")
+    if (item.getEffect() == "")
     {
-        setContentSize(200, (numRowsDesc * getFont()->getHeight() + 
+        setContentSize(200, (numRowsDesc * getFont()->getHeight() +
                       (3 * getFont()->getHeight())));
 
-        mItemWeightScroll->setPosition(2, 
+        mItemWeightScroll->setPosition(2,
                           (numRowsDesc * getFont()->getHeight()) +
                           (2 * getFont()->getHeight()));
     }
     else
     {
-        setContentSize(200, (numRowsDesc * getFont()->getHeight()) + 
+        setContentSize(200, (numRowsDesc * getFont()->getHeight()) +
                       (numRowsEffect * getFont()->getHeight()) +
                       (3 * getFont()->getHeight()));
 
-        mItemWeightScroll->setPosition(2, 
+        mItemWeightScroll->setPosition(2,
                           (numRowsDesc * getFont()->getHeight()) +
                           (numRowsEffect * getFont()->getHeight()) +
                           (2 * getFont()->getHeight()));
@@ -165,9 +165,9 @@ unsigned int ItemPopup::getNumRows()
 void ItemPopup::view(int x, int y)
 {
     if (windowContainer->getWidth() < (x + getWidth() + 5))
-	x = windowContainer->getWidth() - getWidth();
+        x = windowContainer->getWidth() - getWidth();
     if ((y - getHeight() - 5) < 0)
-	y = 0;
+        y = 0;
     else
         y = y - getHeight() - 5;
     setPosition(x, y);
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index b6120af8..d4ad0e20 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ITEMPOPUP_H__
-#define ITEMPOPUP_H__
+#ifndef ITEMPOPUP_H
+#define ITEMPOPUP_H
 
 #include "scrollarea.h"
 #include "textbox.h"
@@ -48,4 +48,4 @@ class ItemPopup : public Window
         ScrollArea *mItemWeightScroll;
 };
 
-#endif // ITEMPOPUP_H__
+#endif // ITEMPOPUP_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 8de2867c..bf1727ac 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -54,7 +54,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *portLabel = new gcn::Label(_("Port:"));
     gcn::Label *dropdownLabel = new gcn::Label(_("Recent:"));
     std::vector<std::string> dfltServer;
-    dfltServer.push_back("server.themanaworld.org"); 
+    dfltServer.push_back("server.themanaworld.org");
     dfltServer.push_back("server.themanaworld.org");
     std::vector<std::string> dfltPort;
     dfltPort.push_back("21001");
diff --git a/src/gui/login.h b/src/gui/login.h
index b85e5ae1..b7abbb2a 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -76,29 +76,29 @@ class LoginDialog : public Window, public gcn::ActionListener,
          */
         bool canSubmit();
 
-	/**
-	 * Function to decide whether string is an unsigned short or not
-	 *
-	 * @param str the string to parse
-	 *
-	 * @return true is str is an unsigned short, false otherwise
-	 */
-	static bool isUShort(const std::string &str);
-
-	/**
-	 * Converts string to an unsigned short (undefined if invalid)
-	 *
-	 * @param str the string to parse
-	 *
-	 * @return the value str represents
-	 */
-	static unsigned short getUShort(const std::string &str);
+        /**
+         * Function to decide whether string is an unsigned short or not
+         *
+         * @param str the string to parse
+         *
+         * @return true is str is an unsigned short, false otherwise
+         */
+        static bool isUShort(const std::string &str);
+
+        /**
+         * Converts string to an unsigned short (undefined if invalid)
+         *
+         * @param str the string to parse
+         *
+         * @return the value str represents
+         */
+        static unsigned short getUShort(const std::string &str);
 
         DropDown *mServerDropDown;
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
         gcn::TextField *mServerField;
-	gcn::TextField *mPortField;
+        gcn::TextField *mPortField;
         gcn::CheckBox *mKeepCheck;
         gcn::Button *mOkButton;
         gcn::Button *mCancelButton;
@@ -114,26 +114,25 @@ class LoginDialog : public Window, public gcn::ActionListener,
         {
             private:
                 std::vector<std::string> mServers;
-		std::vector<std::string> mPorts;
+                std::vector<std::string> mPorts;
                 std::string mConfigPrefix;
                 int mMaxEntries;
                 void saveEntry(const std::string &server,
-			       const std::string &port, int &saved);
+                               const std::string &port, int &saved);
             public:
                 DropDownList(std::string prefix,
                              std::vector<std::string> dfltServer,
-			     std::vector<std::string> dfltPort,
+                             std::vector<std::string> dfltPort,
                              int maxEntries);
                 void save(const std::string &server, const std::string &port);
                 int getNumberOfElements();
                 std::string getElementAt(int i);
-		std::string getServerAt(int i);
-		std::string getPortAt(int i);
+                std::string getServerAt(int i);
+                std::string getPortAt(int i);
         };
         DropDownList *mServerList;
         gcn::ListBox *mServerListBox;
         ScrollArea *mServerScrollArea;
-
 };
 
 #endif
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 7802b583..cc9173ef 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -64,9 +64,9 @@ void Minimap::setMapImage(Image *img)
         const int offsetX = 2 * getPadding();
         const int offsetY = getTitleBarHeight() + getPadding();
         const int titleWidth = getFont()->getWidth(getCaption()) + 15;
-        const int mapWidth = mMapImage->getWidth() < 100 ? 
+        const int mapWidth = mMapImage->getWidth() < 100 ?
                              mMapImage->getWidth() + offsetX : 100;
-        const int mapHeight = mMapImage->getHeight() < 100 ? 
+        const int mapHeight = mMapImage->getHeight() < 100 ?
                               mMapImage->getHeight() + offsetY : 100;
 
         setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth);
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 915db961..39813883 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -109,7 +109,7 @@ void MiniStatusWindow::update()
     // Displays the number of monsters to next lvl
     // (disabled for now but interesting idea)
     /*
-    if(config.getValue("xpBarMonsterCounterExp", 0)!=0)
+    if (config.getValue("xpBarMonsterCounterExp", 0)!=0)
     {
         updatedText << " | "
             << (int)(((float)player_node->mXpForNextLevel - (float)player_node->mXp)
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index dc66a900..018fa489 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -50,7 +50,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
         // 15 == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
         setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight());
-        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 
+        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
                                                3 + (numRows * 14)));
     }
     else
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index e01bedbd..bc50e267 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -31,7 +31,7 @@
  *
  * \ingroup GUI
  */
-class PasswordField : public TextField 
+class PasswordField : public TextField
 {
     public:
         /**
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 9b0c2370..8cb22c55 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -75,53 +75,53 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     switch (being->getType())
     {
-	case Being::PLAYER:
-	    {
-		// Players can be traded with. Later also attack, follow and
-		// add as buddy will be options in this menu.
-		const std::string &name = being->getName();
-		mBrowserBox->addRow(_("@@trade|Trade With ") + name + "@@");
-		mBrowserBox->addRow(_("@@attack|Attack ") + name + "@@");
-
-		mBrowserBox->addRow("##3---");
-
-		switch (player_relations.getRelation(name)) {
-		case PlayerRelation::NEUTRAL:
-		    mBrowserBox->addRow(_("@@friend|Befriend ") + name + "@@");
-
-		case PlayerRelation::FRIEND:
-		    mBrowserBox->addRow(_("@@disregard|Disregard ") + name + "@@");
-		    mBrowserBox->addRow(_("@@ignore|Ignore ") + name + "@@");
-		    break;
-
-		case PlayerRelation::DISREGARDED:
-		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
-		    mBrowserBox->addRow(_("@@ignore|Completely ignore ") + name + "@@");
-		    break;
-
-		case PlayerRelation::IGNORED:
-		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
-		    break;
-		}
-
-		//mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
-		//mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
-
-		mBrowserBox->addRow("##3---");
-		mBrowserBox->addRow(_("@@party-invite|Invite ") + name +
-				    " to party@@");
-	    }
-	    break;
-
-	case Being::NPC:
-	    // NPCs can be talked to (single option, candidate for removal
-	    // unless more options would be added)
-	    mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
-	    break;
-
-	default:
-	    /* Other beings aren't interesting... */
-	    break;
+        case Being::PLAYER:
+            {
+                // Players can be traded with. Later also attack, follow and
+                // add as buddy will be options in this menu.
+                const std::string &name = being->getName();
+                mBrowserBox->addRow(_("@@trade|Trade With ") + name + "@@");
+                mBrowserBox->addRow(_("@@attack|Attack ") + name + "@@");
+
+                mBrowserBox->addRow("##3---");
+
+                switch (player_relations.getRelation(name)) {
+                    case PlayerRelation::NEUTRAL:
+                        mBrowserBox->addRow(_("@@friend|Befriend ") + name + "@@");
+
+                    case PlayerRelation::FRIEND:
+                        mBrowserBox->addRow(_("@@disregard|Disregard ") + name + "@@");
+                        mBrowserBox->addRow(_("@@ignore|Ignore ") + name + "@@");
+                        break;
+
+                    case PlayerRelation::DISREGARDED:
+                        mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
+                        mBrowserBox->addRow(_("@@ignore|Completely ignore ") + name + "@@");
+                        break;
+
+                    case PlayerRelation::IGNORED:
+                        mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
+                        break;
+                }
+
+                //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
+                //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
+
+                mBrowserBox->addRow("##3---");
+                mBrowserBox->addRow(_("@@party-invite|Invite ") + name +
+                        " to party@@");
+            }
+            break;
+
+        case Being::NPC:
+            // NPCs can be talked to (single option, candidate for removal
+            // unless more options would be added)
+            mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
+            break;
+
+        default:
+            /* Other beings aren't interesting... */
+            break;
     }
 
     //browserBox->addRow("@@look|Look To@@");
@@ -153,28 +153,28 @@ void PopupMenu::handleLink(const std::string& link)
 
     // Talk To action
     if (link == "talk" &&
-	being != NULL &&
-	being->getType() == Being::NPC &&
-	current_npc == 0)
+        being != NULL &&
+        being->getType() == Being::NPC &&
+        current_npc == 0)
     {
-	dynamic_cast<NPC*>(being)->talk();
+        dynamic_cast<NPC*>(being)->talk();
     }
 
     // Trade action
     else if (link == "trade" &&
-	     being != NULL &&
-	     being->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_node->trade(being);
-	tradePartnerName = being->getName();
+        player_node->trade(being);
+        tradePartnerName = being->getName();
     }
 
     // Attack action
     else if (link == "attack" &&
-	     being != NULL &&
-	     being->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_node->attack(being, true);
+        player_node->attack(being, true);
     }
 
     else if (link == "unignore" &&
@@ -199,10 +199,10 @@ void PopupMenu::handleLink(const std::string& link)
     }
 
     else if (link == "friend" &&
-	     being != NULL &&
-	     being->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
+        player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
 
     /*
@@ -215,16 +215,16 @@ void PopupMenu::handleLink(const std::string& link)
     // Add Buddy action
     else if ((link == "buddy") && being != NULL && being->isPlayer())
     {
-	if (!buddyWindow->isVisible())
-	    buddyWindow->setVisible(true);
+        if (!buddyWindow->isVisible())
+            buddyWindow->setVisible(true);
 
-	buddyWindow->addBuddy(being->getName());
+        buddyWindow->addBuddy(being->getName());
     }*/
 
     // Pick Up Floor Item action
     else if ((link == "pickup") && mFloorItem != NULL)
     {
-	player_node->pickUp(mFloorItem);
+        player_node->pickUp(mFloorItem);
     }
 
     // Look To action
@@ -234,46 +234,46 @@ void PopupMenu::handleLink(const std::string& link)
 
     else if (link == "use")
     {
-	assert(mItem);
-	if (mItem->isEquipment())
-	{
-	    if (mItem->isEquipped())
-	    {
-		player_node->unequipItem(mItem);
-	    }
-	    else
-	    {
-		player_node->equipItem(mItem);
-	    }
-	}
-	else
-	{
-	    player_node->useItem(mItem);
-	}
+        assert(mItem);
+        if (mItem->isEquipment())
+        {
+            if (mItem->isEquipped())
+            {
+                player_node->unequipItem(mItem);
+            }
+            else
+            {
+                player_node->equipItem(mItem);
+            }
+        }
+        else
+        {
+            player_node->useItem(mItem);
+        }
     }
 
     else if (link == "chat")
     {
-	chatWindow->addItemText(mItem->getId(), mItem->getInfo().getName());
+        chatWindow->addItemText(mItem->getId(), mItem->getInfo().getName());
     }
 
     else if (link == "drop")
     {
-	new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
+        new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
     }
     else if (link == "party-invite" &&
-	     being != NULL &&
-	     being->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	MessageOut outMsg(player_node->getNetwork());
-	outMsg.writeInt16(CMSG_PARTY_INVITE);
-	outMsg.writeInt32(being->getId());
+        MessageOut outMsg(player_node->getNetwork());
+        outMsg.writeInt16(CMSG_PARTY_INVITE);
+        outMsg.writeInt32(being->getId());
     }
 
     // Unknown actions
     else
     {
-	std::cout << link << std::endl;
+        std::cout << link << std::endl;
     }
 
     setVisible(false);
@@ -311,9 +311,9 @@ void PopupMenu::showPopup(int x, int y)
 {
     setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
     if (windowContainer->getWidth() < (x + getWidth() + 5))
-	x = windowContainer->getWidth() - getWidth();
+        x = windowContainer->getWidth() - getWidth();
     if (windowContainer->getHeight() < (y + getHeight() + 5))
-	y = windowContainer->getHeight() - getHeight();
+        y = windowContainer->getHeight() - getHeight();
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 9c337d9e..bf45b711 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -255,21 +255,21 @@ bool RegisterDialog::isUShort(const std::string &str)
 {
     if (str == "")
     {
-	return false;
+        return false;
     }
     unsigned long l = 0;
     for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
-	 strPtr != strEnd; ++strPtr)
+         strPtr != strEnd; ++strPtr)
     {
-	if (*strPtr < '0' || *strPtr > '9')
+        if (*strPtr < '0' || *strPtr > '9')
         {
-	    return false;
-	}
-	l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
-	if (l > 65535)
-	{
-	    return false;
-	}
+            return false;
+        }
+        l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+        if (l > 65535)
+        {
+            return false;
+        }
     }
     return true;
 }
@@ -278,9 +278,9 @@ unsigned short RegisterDialog::getUShort(const std::string &str)
 {
     unsigned long l = 0;
     for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
-	 strPtr != strEnd; ++strPtr)
+         strPtr != strEnd; ++strPtr)
     {
-	l = l * 10 + (*strPtr - '0');
+        l = l * 10 + (*strPtr - '0');
     }
     return static_cast<unsigned short>(l);
 }
diff --git a/src/gui/register.h b/src/gui/register.h
index 4b95a07b..8ba377fa 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -74,29 +74,29 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          */
         bool canSubmit() const;
 
-	/**
-	 * Function to decide whether string is an unsigned short or not
-	 *
-	 * @param str the string to parse
-	 *
-	 * @return true if str is an unsigned short, false otherwise
-	 */
-	static bool isUShort(const std::string &str);
-
-	/**
-	 * Converts string to an unsigned short (undefined if invalid)
-	 *
-	 * @param str the string to parse
-	 *
-	 * @return the value str represents
-	 */
-	static unsigned short getUShort(const std::string &str);
+        /**
+         * Function to decide whether string is an unsigned short or not
+         *
+         * @param str the string to parse
+         *
+         * @return true if str is an unsigned short, false otherwise
+         */
+        static bool isUShort(const std::string &str);
+
+        /**
+         * Converts string to an unsigned short (undefined if invalid)
+         *
+         * @param str the string to parse
+         *
+         * @return the value str represents
+         */
+        static unsigned short getUShort(const std::string &str);
 
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
         gcn::TextField *mConfirmField;
         gcn::TextField *mServerField;
-	gcn::TextField *mPortField;
+        gcn::TextField *mPortField;
 
         gcn::Button *mRegisterButton;
         gcn::Button *mCancelButton;
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 1d7f8472..3ee27064 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -108,9 +108,9 @@ void ScrollArea::init()
         int vsgridy[4] = {0, 4, 15, 19};
         a = 0;
 
-        for (y = 0; y < 3; y++) 
+        for (y = 0; y < 3; y++)
         {
-            for (x = 0; x < 3; x++) 
+            for (x = 0; x < 3; x++)
             {
                 vMarker.grid[a] = vscroll->getSubImage(
                         vsgridx[x], vsgridy[y],
@@ -202,7 +202,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
     int w = getWidth() + bs * 2;
     int h = getHeight() + bs * 2;
 
-    if (mOpaque) 
+    if (mOpaque)
     {
         static_cast<Graphics*>(graphics)->
             drawImageRect(0, 0, w, h, background);
@@ -213,11 +213,11 @@ void ScrollArea::setOpaque(bool opaque)
 {
     mOpaque = opaque;
 
-    if (mOpaque) 
+    if (mOpaque)
     {
         setFrameSize(2);
     }
-    else 
+    else
     {
         setFrameSize(0);
     }
@@ -228,7 +228,7 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
     int state = 0;
     gcn::Rectangle dim;
 
-    switch(dir) 
+    switch (dir)
     {
         case UP:
             state = mUpButtonPressed ? 1 : 0;
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index f68dc9c8..51442798 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -228,7 +228,7 @@ int SDLInput::convertMouseButton(int button)
 int SDLInput::convertKeyCharacter(SDL_Event event)
 {
     SDL_keysym keysym = event.key.keysym;
-    
+
     int value = keysym.unicode;
 
     switch (keysym.sym)
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index d03bc809..e7675c7d 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -43,7 +43,7 @@ ShortcutContainer::ShortcutContainer():
 void ShortcutContainer::widgetResized(const gcn::Event &event)
 {
     mGridWidth = getWidth() / mBoxWidth;
-    if (mGridWidth < 1) 
+    if (mGridWidth < 1)
     {
         mGridWidth = 1;
     }
@@ -52,7 +52,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
                 (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 
     mGridHeight = getHeight() / mBoxHeight;
-    if (mGridHeight < 1) 
+    if (mGridHeight < 1)
     {
         mGridHeight = 1;
     }
@@ -62,7 +62,7 @@ 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)) 
+    if (!tRect.isPointInRect(pointX, pointY))
     {
         return -1;
     }
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 3a7cf0e0..799fc35b 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -46,9 +46,9 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
     const int width = (int) config.getValue("screenwidth", 800);
     const int height = (int) config.getValue("screenheight", 600);
 
-    setDefaultSize(width - mItems->getBoxWidth() - border, 
-                   height - (mItems->getBoxHeight() * mItems->getMaxItems()) - 
-                   border, mItems->getBoxWidth() + border, 
+    setDefaultSize(width - mItems->getBoxWidth() - border,
+                   height - (mItems->getBoxHeight() * mItems->getMaxItems()) -
+                   border, mItems->getBoxWidth() + border,
                    (mItems->getBoxHeight() * mItems->getMaxItems()) + border);
 
     mScrollArea = new ScrollArea(mItems);
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index aad5e16e..84eeb7d4 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -90,7 +90,7 @@ void SpeechBubble::setText(std::string mText)
         setContentSize(mSpeechBox->getMinWidth() + fontHeight,
                       (numRows * fontHeight) + 6);
         mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3,
-                                                 mSpeechBox->getMinWidth() + 5, 
+                                                 mSpeechBox->getMinWidth() + 5,
                                                 (numRows * fontHeight)));
     }
     else
@@ -99,7 +99,7 @@ void SpeechBubble::setText(std::string mText)
         if (width < getFont()->getWidth(mText))
             width = getFont()->getWidth(mText);
         setContentSize(width + fontHeight, (fontHeight * 2) + 6);
-        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, 
+        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3,
                                                  width, fontHeight));
     }
 }
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index cd83a864..9606f8f7 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LOM_SPEECHBUBBLE_H__
-#define _LOM_SPEECHBUBBLE_H__
+#ifndef SPEECHBUBBLE_H
+#define SPEECHBUBBLE_H
 
 #include "scrollarea.h"
 #include "textbox.h"
@@ -29,19 +29,18 @@
 class SpeechBubble : public Window
 {
     public:
-
-	SpeechBubble();
+        SpeechBubble();
 
         void setCaption(const std::string &name,
                         const gcn::Color &color = 0x000000);
-	void setText(std::string mText);
-	void setLocation(int x, int y);
-	unsigned int getNumRows();
+        void setText(std::string mText);
+        void setLocation(int x, int y);
+        unsigned int getNumRows();
 
     private:
         gcn::Label *mCaption;
-	TextBox *mSpeechBox;
-	ScrollArea *mSpeechArea;
+        TextBox *mSpeechBox;
+        ScrollArea *mSpeechArea;
 };
 
 #endif
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 69f6baa1..526fa6b1 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -200,7 +200,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     add(mStatsTitleLabel);
     add(mStatsTotalLabel);
     add(mStatsCostLabel);
-    for(int i = 0; i < 6; i++)
+    for (int i = 0; i < 6; i++)
     {
         add(mStatsLabel[i]);
         add(mStatsDisplayLabel[i]);
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index e69ee808..33dd8cb2 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -54,7 +54,7 @@ void TableModel::signalAfterUpdate()
 #define WIDGET_AT(row, column) (((row) * mColumns) + (column))
 #define DYN_SIZE(h) ((h) >= 0)  // determines whether this size is tagged for auto-detection
 
-StaticTableModel::StaticTableModel(int row, int column, 
+StaticTableModel::StaticTableModel(int row, int column,
                                    gcn::Color backgroundColor, bool opacity) :
     mRows(row),
     mColumns(column),
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index c89e55a2..b20b7c86 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -127,7 +127,7 @@ void TradeWindow::addMoney(int amount)
 
 void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
 {
-    if (own) 
+    if (own)
     {
         mMyItemContainer->setWidth(mMyScroll->getWidth());
         mMyInventory->addItem(id, quantity, equipment);
@@ -141,7 +141,7 @@ void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
 
 void TradeWindow::removeItem(int id, bool own)
 {
-    if (own) 
+    if (own)
         mMyInventory->removeItem(id);
     else
         mPartnerInventory->removeItem(id);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 326a7189..fe058c0a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -176,7 +176,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
 
         // Find a path from the player to the mouse, and draw it. This is for debug
         // purposes.
-        if (mShowDebugPath) 
+        if (mShowDebugPath)
         {
             // Get the current mouse position
             int mouseX, mouseY;
@@ -275,7 +275,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
            mPopupMenu->showPopup(event.getX(), event.getY(), being);
            return;
         }
-        else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
+        else if ((floorItem = floorItemManager->findByCoordinates(tilex,
+                                                                  tiley)))
         {
             mPopupMenu->showPopup(event.getX(), event.getY(), floorItem);
             return;
@@ -294,7 +295,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     {
         Being *being;
         FloorItem *item;
- 
+
         // Interact with some being
 //        if ((being = beingManager->findBeing(tilex, tiley)))
         if ((being = beingManager->findBeingByPixel(x, y)))
@@ -342,7 +343,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     {
         // Find the being nearest to the clicked position
         Being *target = beingManager->findBeingByPixel(x, y);
- 
+
         if (target)
         {
              player_node->setTarget(target);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e0e88b31..e97e9416 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -82,7 +82,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
-    if (!windowContainer) 
+    if (!windowContainer)
     {
         throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
     }
@@ -133,7 +133,7 @@ Window::~Window()
         config.setValue(name + "WinY", getY());
         config.setValue(name + "Visible", isVisible());
 
-        if (mGrip) 
+        if (mGrip)
         {
             config.setValue(name + "WinWidth", getWidth());
             config.setValue(name + "WinHeight", getHeight());
@@ -152,7 +152,7 @@ Window::~Window()
     instances--;
 
     // Clean up static resources
-    for( int i = 0; i < 9; i++ )
+    for (int i = 0; i < 9; i++)
     {
         delete border.grid[i];
         border.grid[i] = NULL;
@@ -523,7 +523,7 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
 void Window::setGuiAlpha()
 {
     //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8));
-    for(int i = 0; i < 9; i++)
+    for (int i = 0; i < 9; i++)
     {
         //logger->log("Window::setGuiAlpha: Border Image (%i)", i);
         border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
@@ -532,7 +532,7 @@ void Window::setGuiAlpha()
     mAlphaChanged = false;
 }
 
-void Window::loadSkin(const std::string filename)
+void Window::loadSkin(const std::string &filename)
 {
     const std::string windowId = Window::getId();
 
@@ -542,7 +542,7 @@ void Window::loadSkin(const std::string filename)
     logger->log("Loading Window ID '%s'.", windowId.c_str());
 
 
-    if(filename == "")
+    if (filename.empty())
         logger->error("Window::loadSkin(): Invalid File Name.");
 
     // TODO:
@@ -560,7 +560,7 @@ void Window::loadSkin(const std::string filename)
     std::string skinSetImage;
     skinSetImage = XML::getProperty(rootNode, "image", "");
     Image *dBorders = NULL;
-    if(skinSetImage != "")
+    if (!skinSetImage.empty())
     {
         logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
         dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png");
@@ -594,7 +594,7 @@ void Window::loadSkin(const std::string filename)
                 std::string partType;
                 partType = XML::getProperty(partNode, "type", "unknown");
                 // TOP ROW
-                if(partType == "top-left-corner")
+                if (partType == "top-left-corner")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -603,7 +603,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "top-edge")
+                else if (partType == "top-edge")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -612,7 +612,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "top-right-corner")
+                else if (partType == "top-right-corner")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -623,7 +623,7 @@ void Window::loadSkin(const std::string filename)
                 }
 
                 // MIDDLE ROW
-                else if(partType == "left-edge")
+                else if (partType == "left-edge")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -632,7 +632,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "bg-quad")
+                else if (partType == "bg-quad")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -641,7 +641,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "right-edge")
+                else if (partType == "right-edge")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -652,7 +652,7 @@ void Window::loadSkin(const std::string filename)
                 }
 
                 // BOTTOM ROW
-                else if(partType == "bottom-left-corner")
+                else if (partType == "bottom-left-corner")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -661,7 +661,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "bottom-edge")
+                else if (partType == "bottom-edge")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -670,7 +670,7 @@ void Window::loadSkin(const std::string filename)
 
                     border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
                 }
-                else if(partType == "bottom-right-corner")
+                else if (partType == "bottom-right-corner")
                 {
                     const int xPos = XML::getProperty(partNode, "xpos", 0);
                     const int yPos = XML::getProperty(partNode, "ypos", 0);
diff --git a/src/gui/window.h b/src/gui/window.h
index deaf984c..518de6e9 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -263,7 +263,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         /**
          * Loads a window skin
          */
-        void loadSkin(const std::string filename);
+        void loadSkin(const std::string &filename);
 
         /**
          * Adds a widget to the window and sets it at given cell.
diff --git a/src/joystick.h b/src/joystick.h
index a7090293..e053fecc 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -30,7 +30,7 @@ class Joystick
         /**
          * Number of buttons we can handle.
          */
-        enum { 
+        enum {
             MAX_BUTTONS = 6
         };
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index e351d1cc..32fc0216 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -130,19 +130,19 @@ void KeyboardConfig::makeDefault()
 bool KeyboardConfig::hasConflicts()
 {
     int i, j;
-/**
- * No need to parse the square matrix: only check one triangle
- * that's enough to detect conflicts
- */
+    /**
+     * No need to parse the square matrix: only check one triangle
+     * that's enough to detect conflicts
+     */
     for (i = 0; i < KEY_TOTAL; i++)
     {
         for (j = i, j++; j < KEY_TOTAL; j++)
         {
             // Allow for item shortcut and emote keys to overlap, but no other keys
-            if (!(((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && 
+            if (!(((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) &&
                   ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12)))
                  && mKey[i].value == mKey[j].value
-	       )
+               )
             {
                 return true;
             }
@@ -160,7 +160,7 @@ int KeyboardConfig::getKeyIndex(int keyValue) const
 {
     for (int i = 0; i < KEY_TOTAL; i++)
     {
-        if(keyValue == mKey[i].value)
+        if (keyValue == mKey[i].value)
         {
             return i;
         }
@@ -173,7 +173,7 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const
 {
     for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_12; i++)
     {
-        if(keyValue == mKey[i].value)
+        if (keyValue == mKey[i].value)
         {
             return 1 + i - KEY_EMOTE_1;
         }
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 15f5b6b2..5eef30e1 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -69,7 +69,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mGoingToTarget(false),
     mTargetTime(-1), mLastAction(-1),
-    mLastTarget(-1), mWalkingDir(0), 
+    mLastTarget(-1), mWalkingDir(0),
     mDestX(0), mDestY(0),
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
@@ -173,7 +173,7 @@ void LocalPlayer::logic()
 }
 
 void LocalPlayer::setGM()
-{ 
+{
     mIsGM = !mIsGM;
     mNameColor = mIsGM ? 0x009000: 0x202020;
     setName(getName());
@@ -503,7 +503,7 @@ void LocalPlayer::attack(Being *target, bool keep)
     int dist_y = target->mY - mY;
 
     // Must be standing and be within attack range to continue
-    if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || 
+    if ((mAction != STAND) || (mAttackRange < abs(dist_x)) ||
         (mAttackRange < abs(dist_y)))
         return;
 
@@ -690,7 +690,7 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height,
         mOutRangeImages[size] = currentImageSet;
         mTargetCursorOutRange[size] = currentCursor;
     }
-    else 
+    else
     {
         mInRangeImages[size] = currentImageSet;
         mTargetCursorInRange[size] = currentCursor;
@@ -717,7 +717,7 @@ void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY)
         {
             mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
         }
-        else 
+        else
         {
             mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
         }
diff --git a/src/main.cpp b/src/main.cpp
index fb5486d5..2d77f18c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -204,7 +204,7 @@ void setUpdatesDir()
     {
         if (pos + 3 < updateHost.length())
         {
-            updates << "updates/" << updateHost.substr(pos + 3) 
+            updates << "updates/" << updateHost.substr(pos + 3)
                     << "/" << loginData.port;
             updatesDir = updates.str();
         }
@@ -963,15 +963,15 @@ int main(int argc, char *argv[])
                 case CHAR_SERVER_STATE:
                     logger->log("State: CHAR_SERVER");
 
-                    if (n_server == 1) 
+                    if (n_server == 1)
                     {
                         SERVER_INFO *si = *server_info;
                         loginData.hostname = iptostring(si->address);
                         loginData.port = si->port;
                         loginData.updateHost = si->updateHost;
                         state = UPDATE_STATE;
-                    } 
-                    else 
+                    }
+                    else
                     {
                         int nextState = (options.skipUpdate) ?
                             LOADDATA_STATE : UPDATE_STATE;
@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
                                                                 nextState);
                         positionDialog(currentDialog, screenWidth,
                                                       screenHeight);
-                        if (options.chooseDefault || options.playername != "") 
+                        if (options.chooseDefault || options.playername != "")
                         {
                             ((ServerSelectDialog*) currentDialog)->action(
                                 gcn::ActionEvent(NULL, "ok"));
diff --git a/src/monster.cpp b/src/monster.cpp
index 68ed22f8..3b0c2029 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -75,7 +75,7 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
     mNameColor = 0xff2020;
 }
 
-Monster::~Monster() 
+Monster::~Monster()
 {
     if (mText)
     {
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 8aaede44..e13ef3a2 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -240,7 +240,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             switch (type)
             {
                 case 0x0a: // Critical Damage
-                    if (dstBeing) 
+                    if (dstBeing)
                          dstBeing->showCrit();
                 case 0x00: // Damage
                     if (dstBeing)
@@ -250,7 +250,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
                     break;
 
                 case 0x02: // Sit
-                    if (srcBeing) 
+                    if (srcBeing)
                     {
                         srcBeing->mFrame = 0;
                         srcBeing->setAction(Being::SIT);
@@ -258,7 +258,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
                     break;
 
                 case 0x03: // Stand up
-                    if (srcBeing) 
+                    if (srcBeing)
                     {
                         srcBeing->mFrame = 0;
                         srcBeing->setAction(Being::STAND);
@@ -454,7 +454,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 switch (msg->readInt8())
                 {
                     case 1:
-			if (dstBeing->getType() != Being::NPC)
+                        if (dstBeing->getType() != Being::NPC)
                             dstBeing->setAction(Being::DEAD);
                         break;
 
@@ -543,4 +543,3 @@ void BeingHandler::handleMessage(MessageIn *msg)
             break;
     }
 }
-
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index db601214..a262e361 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -110,7 +110,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                         iptostring(server_info[i]->address),
                         server_info[i]->port);
             }
-            state = CHAR_SERVER_STATE; 
+            state = CHAR_SERVER_STATE;
             break;
 
         case 0x006a:
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 82b07d41..20f2b7dc 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -79,7 +79,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
          case SMSG_NPC_CLOSE:
             id = msg->readInt32();
             if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
-            	current_npc = NULL;
+                current_npc = NULL;
             break;
 
         case SMSG_NPC_NEXT:
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index d4b7455b..8f0b3a00 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -35,17 +35,17 @@
 PartyHandler::PartyHandler(Party *party) : mParty(party)
 {
     static const Uint16 _messages[] = {
-	SMSG_PARTY_CREATE,
-	SMSG_PARTY_INFO,
-	SMSG_PARTY_INVITE,
-	SMSG_PARTY_INVITED,
-	SMSG_PARTY_SETTINGS,
-	SMSG_PARTY_MEMBER_INFO,
-	SMSG_PARTY_LEAVE,
-	SMSG_PARTY_UPDATE_HP,
-	SMSG_PARTY_UPDATE_COORDS,
-	SMSG_PARTY_MESSAGE,
-	0
+        SMSG_PARTY_CREATE,
+        SMSG_PARTY_INFO,
+        SMSG_PARTY_INVITE,
+        SMSG_PARTY_INVITED,
+        SMSG_PARTY_SETTINGS,
+        SMSG_PARTY_MEMBER_INFO,
+        SMSG_PARTY_LEAVE,
+        SMSG_PARTY_UPDATE_HP,
+        SMSG_PARTY_UPDATE_COORDS,
+        SMSG_PARTY_MESSAGE,
+        0
     };
     handledMessages = _messages;
 }
@@ -54,70 +54,70 @@ void PartyHandler::handleMessage(MessageIn *msg)
 {
     switch (msg->getId())
     {
-	case SMSG_PARTY_CREATE:
-  	    mParty->createResponse(msg->readInt8());
-	    break;
-	case SMSG_PARTY_INFO:
-	    break;
-	case SMSG_PARTY_INVITE:
-	    {
-		std::string nick = msg->readString(24);
-		int status = msg->readInt8();
-		mParty->inviteResponse(nick, status);
-		break;
-	    }
-	case SMSG_PARTY_INVITED:
-	    {
-		int id = msg->readInt32();
-		Being *being = beingManager->findBeing(id);
-		if (being == NULL)
-		{
-		    break;
-		}
-		std::string nick;
+        case SMSG_PARTY_CREATE:
+            mParty->createResponse(msg->readInt8());
+            break;
+        case SMSG_PARTY_INFO:
+            break;
+        case SMSG_PARTY_INVITE:
+            {
+                std::string nick = msg->readString(24);
+                int status = msg->readInt8();
+                mParty->inviteResponse(nick, status);
+                break;
+            }
+        case SMSG_PARTY_INVITED:
+            {
+                int id = msg->readInt32();
+                Being *being = beingManager->findBeing(id);
+                if (being == NULL)
+                {
+                    break;
+                }
+                std::string nick;
                 int gender = 0;
-		std::string partyName = "";
-		if (being->getType() != Being::PLAYER)
-		{
- 		    nick = "";
-		}
-		else
-		{
-		    nick = being->getName();
-		    gender = being->getGender();
-		    partyName = msg->readString(24);
-		}
-		mParty->invitedAsk(nick, gender, partyName);
-		break;
-	    }
-	case SMSG_PARTY_SETTINGS:
-	    break;
-	case SMSG_PARTY_MEMBER_INFO:
-	    break;
-	case SMSG_PARTY_LEAVE:
-	    {
-	        /*int id = */msg->readInt32();
-		std::string nick = msg->readString(24);
-		/*int fail = */msg->readInt8();
-		mParty->leftResponse(nick);
-		break;
-	    }
-	case SMSG_PARTY_UPDATE_HP:
-	    break;
-	case SMSG_PARTY_UPDATE_COORDS:
-	    break;
-	case SMSG_PARTY_MESSAGE:
-	    { // new block to enable local variables
-		int msgLength = msg->readInt16() - 8;
-		if (msgLength <= 0)
-		{
- 		    return;
-		}
-		int id = msg->readInt32();
-		Being *being = beingManager->findBeing(id);
-		std::string chatMsg = msg->readString(msgLength);
-		mParty->receiveChat(being, chatMsg);
-	    }
-	    break;
+                std::string partyName = "";
+                if (being->getType() != Being::PLAYER)
+                {
+                    nick = "";
+                }
+                else
+                {
+                    nick = being->getName();
+                    gender = being->getGender();
+                    partyName = msg->readString(24);
+                }
+                mParty->invitedAsk(nick, gender, partyName);
+                break;
+            }
+        case SMSG_PARTY_SETTINGS:
+            break;
+        case SMSG_PARTY_MEMBER_INFO:
+            break;
+        case SMSG_PARTY_LEAVE:
+            {
+                /*int id = */msg->readInt32();
+                std::string nick = msg->readString(24);
+                /*int fail = */msg->readInt8();
+                mParty->leftResponse(nick);
+                break;
+            }
+        case SMSG_PARTY_UPDATE_HP:
+            break;
+        case SMSG_PARTY_UPDATE_COORDS:
+            break;
+        case SMSG_PARTY_MESSAGE:
+            { // new block to enable local variables
+                int msgLength = msg->readInt16() - 8;
+                if (msgLength <= 0)
+                {
+                    return;
+                }
+                int id = msg->readInt32();
+                Being *being = beingManager->findBeing(id);
+                std::string chatMsg = msg->readString(msgLength);
+                mParty->receiveChat(being, chatMsg);
+            }
+            break;
     }
 }
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 08d85ad0..048da9b1 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -29,11 +29,11 @@ class Party;
 class PartyHandler : public MessageHandler
 {
     public:
-	PartyHandler(Party *party);
+        PartyHandler(Party *party);
 
-	void handleMessage(MessageIn *msg);
+        void handleMessage(MessageIn *msg);
     private:
-	Party *mParty;
+        Party *mParty;
 };
 
 #endif
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index d06f1108..46ded32e 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -146,7 +146,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 /* Scroll if neccessary */
                 if (!nearby
                     || (abs(x - player_node->mX) > MAP_TELEPORT_SCROLL_DISTANCE)
-                    || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE)) 
+                    || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE))
                 {
                     scrollOffsetX = (x - player_node->mX) * 32;
                     scrollOffsetY = (y - player_node->mY) * 32;
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 0c7c9205..c5465835 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -112,7 +112,7 @@ void TradeHandler::handleMessage(MessageIn *msg)
                             BY_SERVER);
                     break;
                 case 2: // Invite request check failed...
-                    chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), 
+                    chatWindow->chatLog(_("Trade cancelled due to an unknown reason."),
                                         BY_SERVER);
                     break;
                 case 3: // Trade accepted
@@ -191,7 +191,7 @@ void TradeHandler::handleMessage(MessageIn *msg)
                                              BY_SERVER);
                          break;
                     default:
-                        chatWindow->chatLog(_("Failed adding item for unknown reason."), 
+                        chatWindow->chatLog(_("Failed adding item for unknown reason."),
                                              BY_SERVER);
                         break;
                 }
diff --git a/src/party.cpp b/src/party.cpp
index ecb0ab2d..bf9d3a06 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -34,7 +34,9 @@
 #include "utils/strprintf.h"
 
 Party::Party(ChatWindow *chat, Network *network) :
-             mChat(chat), mNetwork(network), mInviteListener(network, &mInParty)
+    mChat(chat),
+    mNetwork(network),
+    mInviteListener(network, &mInParty)
 {
 }
 
@@ -42,24 +44,24 @@ void Party::respond(const std::string &command, const std::string &args)
 {
     if (command == "new" || command == "create")
     {
-	create(args);
-	return;
+        create(args);
+        return;
     }
     if (command == "leave")
     {
-	leave(args);
-	return;
+        leave(args);
+        return;
     }
     if (command == "settings")
     {
-	mChat->chatLog(_("Not yet implemented!"), BY_SERVER);
-	return;
-	/*
-	  MessageOut outMsg(mNetwork);
-	  outMsg.writeInt16(CMSG_PARTY_SETTINGS);
-	  outMsg.writeInt16(0); // Experience
-	  outMsg.writeInt16(0); // Item
-	 */
+        mChat->chatLog(_("Not yet implemented!"), BY_SERVER);
+        return;
+        /*
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_PARTY_SETTINGS);
+        outMsg.writeInt16(0); // Experience
+        outMsg.writeInt16(0); // Item
+        */
     }
     mChat->chatLog(_("Party command not known."), BY_SERVER);
 }
@@ -68,8 +70,8 @@ void Party::create(const std::string &party)
 {
     if (party == "")
     {
-	mChat->chatLog(_("Party name is missing."), BY_SERVER);
-	return;
+        mChat->chatLog(_("Party name is missing."), BY_SERVER);
+        return;
     }
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_PARTY_CREATE);
@@ -89,12 +91,12 @@ void Party::createResponse(bool ok)
 {
     if (ok)
     {
-	mChat->chatLog(_("Party successfully created."), BY_SERVER);
-	mInParty = true;
+        mChat->chatLog(_("Party successfully created."), BY_SERVER);
+        mInParty = true;
     }
     else
     {
-	mChat->chatLog(_("Could not create party."), BY_SERVER);
+        mChat->chatLog(_("Could not create party."), BY_SERVER);
     }
 }
 
@@ -103,34 +105,34 @@ void Party::inviteResponse(const std::string &nick, int status)
     switch (status)
     {
         case 0:
-  	    mChat->chatLog(strprintf(_("%s is already a member of a party."),
-                           nick.c_str()), BY_SERVER);
-	    break;
+            mChat->chatLog(strprintf(_("%s is already a member of a party."),
+                        nick.c_str()), BY_SERVER);
+            break;
         case 1:
-  	    mChat->chatLog(strprintf(_("%s refused your invitation."),
-                           nick.c_str()), BY_SERVER);
-	    break;
+            mChat->chatLog(strprintf(_("%s refused your invitation."),
+                        nick.c_str()), BY_SERVER);
+            break;
         case 2:
- 	    mChat->chatLog(strprintf(_("%s is now a member of your party."),
-                           nick.c_str()), BY_SERVER);
-	    break;
+            mChat->chatLog(strprintf(_("%s is now a member of your party."),
+                        nick.c_str()), BY_SERVER);
+            break;
     }
 }
 
 void Party::invitedAsk(const std::string &nick, int gender,
-		       const std::string &partyName)
+                       const std::string &partyName)
 {
     mPartyName = partyName; /* Quick and nasty - needs redoing */
     if (nick == "")
     {
         mChat->chatLog(_("You can\'t have a blank party name!"), BY_SERVER);
-	return;
+        return;
     }
     mCreating = false;
     ConfirmDialog *dlg = new ConfirmDialog(_("Invite to party"),
-					     strprintf(_("%s invites you to join"
-                                             " the %s party, do you accept?"), 
-                                             nick.c_str(), partyName.c_str()));
+            strprintf(_("%s invites you to join"
+                        " the %s party, do you accept?"),
+                nick.c_str(), partyName.c_str()));
     dlg->addActionListener(&mInviteListener);
 }
 
@@ -146,7 +148,7 @@ void Party::InviteListener::action(const gcn::ActionEvent &event)
 
 void Party::leftResponse(const std::string &nick)
 {
-    mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), 
+    mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()),
                                BY_SERVER);
 }
 
@@ -154,13 +156,13 @@ void Party::receiveChat(Being *being, const std::string &msg)
 {
     if (being == NULL)
     {
-	return;
+        return;
     }
     if (being->getType() != Being::PLAYER)
     {
-	mChat->chatLog(_("Party chat received, but being is not a player"), 
+        mChat->chatLog(_("Party chat received, but being is not a player"),
                        BY_SERVER);
-	return;
+        return;
     }
     being->setSpeech(msg, SPEECH_TIME);
     mChat->chatLog(being->getName() + " : " + msg, BY_PARTY);
@@ -175,46 +177,46 @@ void Party::help(const std::string &msg)
 {
     if (msg == "")
     {
-	mChat->chatLog(_("Command: /party <command> <args>"), BY_SERVER);
-	mChat->chatLog(_("where <command> can be one of:"), BY_SERVER);
-	mChat->chatLog(_("   /new"), BY_SERVER);
-	mChat->chatLog(_("   /create"), BY_SERVER);
-	mChat->chatLog(_("   /prefix"), BY_SERVER);
-	mChat->chatLog(_("   /leave"), BY_SERVER);
-	mChat->chatLog(_("This command implements the partying function."),
-		       BY_SERVER);
-	mChat->chatLog(_("Type /help party <command> for further help."),
-		       BY_SERVER);
-	return;
+        mChat->chatLog(_("Command: /party <command> <args>"), BY_SERVER);
+        mChat->chatLog(_("where <command> can be one of:"), BY_SERVER);
+        mChat->chatLog(_("   /new"), BY_SERVER);
+        mChat->chatLog(_("   /create"), BY_SERVER);
+        mChat->chatLog(_("   /prefix"), BY_SERVER);
+        mChat->chatLog(_("   /leave"), BY_SERVER);
+        mChat->chatLog(_("This command implements the partying function."),
+                       BY_SERVER);
+        mChat->chatLog(_("Type /help party <command> for further help."),
+                       BY_SERVER);
+        return;
     }
     if (msg == "new" || msg == "create")
     {
-	mChat->chatLog(_("Command: /party new <party-name>"), BY_SERVER);
-	mChat->chatLog(_("Command: /party create <party-name>"), BY_SERVER);
-	mChat->chatLog(_("These commands create a new party <party-name."),
-		       BY_SERVER);
-	return;
+        mChat->chatLog(_("Command: /party new <party-name>"), BY_SERVER);
+        mChat->chatLog(_("Command: /party create <party-name>"), BY_SERVER);
+        mChat->chatLog(_("These commands create a new party <party-name."),
+                BY_SERVER);
+        return;
     }
     if (msg == "prefix")
     {
-	mChat->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER);
-	mChat->chatLog(_("This command sets the party prefix character."),
-		       BY_SERVER);
-	mChat->chatLog(_("Any message preceded by <prefix-char> is sent to "
-		       "the party instead of everyone."), BY_SERVER);
-	mChat->chatLog(_("Command: /party prefix"), BY_SERVER);
-	mChat->chatLog(_("This command reports the current party prefix "
-		       "character."), BY_SERVER);
-	return;
+        mChat->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER);
+        mChat->chatLog(_("This command sets the party prefix character."),
+                       BY_SERVER);
+        mChat->chatLog(_("Any message preceded by <prefix-char> is sent to "
+                         "the party instead of everyone."), BY_SERVER);
+        mChat->chatLog(_("Command: /party prefix"), BY_SERVER);
+        mChat->chatLog(_("This command reports the current party prefix "
+                         "character."), BY_SERVER);
+        return;
     }
     //if (msg == "settings")
     //if (msg == "info")
     if (msg == "leave")
     {
-	mChat->chatLog(_("Command: /party leave"), BY_SERVER);
-	mChat->chatLog(_("This command causes the player to leave the party."),
-		       BY_SERVER);
-	return;
+        mChat->chatLog(_("Command: /party leave"), BY_SERVER);
+        mChat->chatLog(_("This command causes the player to leave the party."),
+                BY_SERVER);
+        return;
     }
     mChat->chatLog(_("Unknown /party command."), BY_SERVER);
     mChat->chatLog(_("Type /help party for a list of options."), BY_SERVER);
diff --git a/src/party.h b/src/party.h
index 8d6dce47..846b9d11 100644
--- a/src/party.h
+++ b/src/party.h
@@ -33,41 +33,45 @@ class Network;
 
 class Party
 {
-     public:
-  Party(ChatWindow *chat, Network *network);
-	 void respond(const std::string &command, const std::string &args);
+    public:
+        Party(ChatWindow *chat, Network *network);
+        void respond(const std::string &command, const std::string &args);
 
-	 void create(const std::string &party);
-	 void leave(const std::string &args);
+        void create(const std::string &party);
+        void leave(const std::string &args);
 
-	 void createResponse(bool ok);
-	 void inviteResponse(const std::string &nick, int status);
-	 void invitedAsk(const std::string &nick, int gender,
-			 const std::string &partyName);
-	 void leftResponse(const std::string &nick);
-	 void receiveChat(Being *being, const std::string &msg);
+        void createResponse(bool ok);
+        void inviteResponse(const std::string &nick, int status);
+        void invitedAsk(const std::string &nick, int gender,
+                const std::string &partyName);
+        void leftResponse(const std::string &nick);
+        void receiveChat(Being *being, const std::string &msg);
 
-	 void help();
-	 void help(const std::string &msg);
-     private:
-         ChatWindow *mChat;
-         std::string mPartyName;
-	 Network *mNetwork;
-	 bool mInParty;
-	 bool mCreating; /**< Used to give an appropriate response to
-			    failure */
-	 PartyHandler *handler;
+        void help();
+        void help(const std::string &msg);
 
-	 class InviteListener : public gcn::ActionListener
-	 {
-    	     public:
-	         InviteListener(Network *network, bool *inParty) :
-	                        mNetwork(network), mInParty(inParty) {};
-		 void action(const gcn::ActionEvent &event);
-		 Network *mNetwork;
-	     private:
-		 bool *mInParty;
-	 };
-	 InviteListener mInviteListener;
+    private:
+        ChatWindow *mChat;
+        std::string mPartyName;
+        Network *mNetwork;
+        bool mInParty;
+        bool mCreating; /**< Used to give an appropriate response to
+                          failure */
+        PartyHandler *handler;
+
+        class InviteListener : public gcn::ActionListener
+        {
+            public:
+                InviteListener(Network *network, bool *inParty) :
+                    mNetwork(network),
+                    mInParty(inParty)
+                {}
+                void action(const gcn::ActionEvent &event);
+                Network *mNetwork;
+            private:
+                bool *mInParty;
+        };
+        InviteListener mInviteListener;
 };
+
 #endif
diff --git a/src/recorder.cpp b/src/recorder.cpp
index 03fa2855..9f166fef 100644
--- a/src/recorder.cpp
+++ b/src/recorder.cpp
@@ -34,11 +34,16 @@ Recorder::Recorder(ChatWindow *chat) : mChat(chat)
     mButtonBox->setY(20);
 }
 
+Recorder::~Recorder()
+{
+    delete mButtonBox;
+}
+
 void Recorder::record(const std::string &msg)
 {
     if (mStream.is_open())
     {
-	mStream << msg << std::endl;
+        mStream << msg << std::endl;
     }
 }
 
@@ -48,44 +53,44 @@ void Recorder::respond(const std::string &msg)
     trim(msgCopy);
     if (msgCopy == "")
     {
-	if (mStream.is_open())
-	{
-	    mStream.close();
-	    mButtonBox->setVisible(false);
-	    /*
-	     * Message should go after mStream is closed so that it isn't
-	     * recorded.
-	     */
-	    mChat->chatLog("Finishing recording.", BY_SERVER);
-	}
-	else
-	{
-	    mChat->chatLog("Not currently recording.", BY_SERVER);
-	}
-	return;
+        if (mStream.is_open())
+        {
+            mStream.close();
+            mButtonBox->setVisible(false);
+            /*
+             * Message should go after mStream is closed so that it isn't
+             * recorded.
+             */
+            mChat->chatLog("Finishing recording.", BY_SERVER);
+        }
+        else
+        {
+            mChat->chatLog("Not currently recording.", BY_SERVER);
+        }
+        return;
     }
     if (mStream.is_open())
     {
-	mChat->chatLog("Already recording.", BY_SERVER);
+        mChat->chatLog("Already recording.", BY_SERVER);
     }
     else
     {
-	/*
-	 * Message should go before mStream is opened so that it isn't
-	 * recorded.
-	 */
-	mChat->chatLog("Starting to record...", BY_SERVER);
+        /*
+         * Message should go before mStream is opened so that it isn't
+         * recorded.
+         */
+        mChat->chatLog("Starting to record...", BY_SERVER);
         std::string file = std::string(PHYSFS_getUserDir()) + "/.tmw/" + msgCopy;
-        
-	mStream.open(file.c_str(), std::ios_base::trunc);
-	if (mStream.is_open())
-	{
-	    mButtonBox->setVisible(true);
-	}
-	else
-	{
-	    mChat->chatLog("Failed to start recording.", BY_SERVER);
-	}
+
+        mStream.open(file.c_str(), std::ios_base::trunc);
+        if (mStream.is_open())
+        {
+            mButtonBox->setVisible(true);
+        }
+        else
+        {
+            mChat->chatLog("Failed to start recording.", BY_SERVER);
+        }
     }
 }
 
@@ -98,7 +103,7 @@ void Recorder::help(const std::string &args) const
 {
     mChat->chatLog("Command: /record <filename>", BY_SERVER);
     mChat->chatLog("This command starts recording the chat log to the file "
-		  "<filename>.", BY_SERVER);
+                   "<filename>.", BY_SERVER);
     mChat->chatLog("Command: /record", BY_SERVER);
     mChat->chatLog("This command finishes a recording session.", BY_SERVER);
 }
@@ -107,8 +112,3 @@ void Recorder::buttonBoxRespond()
 {
     respond("");
 }
-
-Recorder::~Recorder()
-{
-    delete mButtonBox;
-}
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 541acabe..719ecab1 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -55,9 +55,9 @@ void BuddyList::loadFile()
         char *buddy = new char[LEN_MAX_USERNAME];
         inputStream.getline(buddy, LEN_MAX_USERNAME);
         // Ugly ?
-        if(strcmp(buddy,"")) mBuddylist.push_back(buddy);
+        if (strcmp(buddy, "")) mBuddylist.push_back(buddy);
         delete [] buddy;
-    } while(!inputStream.eof());
+    } while (!inputStream.eof());
 
     // Read buddy and close file
     inputStream.close();
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index f80ca6b3..34c48496 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  along with Aethyra; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -103,7 +103,7 @@ void ColorDB::unload()
 
 std::string& ColorDB::get(int id)
 {
-    if(!mLoaded)
+    if (!mLoaded)
         load();
 
     ColorIterator i = mColors.find(id);
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 65b7f759..892411f8 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  along with Aethyra; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 2f43822d..bbc6b634 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  along with Aethyra; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 0962edad..2b9dbbc2 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  along with Aethyra; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 75464035..359791fd 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -67,13 +67,13 @@ class MonsterInfo
 
         void addParticleEffect(std::string filename);
 
-        const std::string& getName() const 
+        const std::string& getName() const
         { return mName; }
 
-        const std::list<std::string>& getSprites() const 
+        const std::list<std::string>& getSprites() const
         { return mSprites; }
 
-        Being::TargetCursorSize getTargetCursorSize() const 
+        Being::TargetCursorSize getTargetCursorSize() const
         { return mTargetCursorSize; }
 
         std::string getSound(MonsterSoundEvent event) const;
@@ -83,7 +83,7 @@ class MonsterInfo
         void addAttackParticleEffect(const std::string &particleEffect)
         { mAttackParticle = particleEffect; }
 
-        const std::list<std::string>& getParticleEffects() const 
+        const std::list<std::string>& getParticleEffects() const
         { return mParticleEffects; }
 
     private:
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 73f55fd3..c3c68d88 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -100,7 +100,7 @@ class ResourceManager
         /**
          * Returns the real path to a file. Note that this method will always
          * return a path, it does not check whether the file exists.
-         * 
+         *
          * @param file The file to get the real path to.
          * @return The real path.
          */