Merged revisions 3828-3829,3831-3838,3841,3843-3844,3847-3872,3874,3876-3900 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3828 | crush_tmw | 2007-12-31 17:14:27 +0100 (Mon, 31 Dec 2007) | 1 line
  
  Added config options to set the scroll center. Retained scroll offset during map change for smoother map transitions.
........
  r3859 | b_lindeijer | 2008-01-26 20:38:43 +0100 (Sat, 26 Jan 2008) | 3 lines
  
  Fixed a GCC 4.3 compile error and constified the usage of auto_ptr, since
  that's the way in which we are using them.
........
  r3876 | crush_tmw | 2008-02-11 20:00:43 +0100 (Mon, 11 Feb 2008) | 1 line
  
  Added music and overlay to snake dungeon.
........
  r3883 | crush_tmw | 2008-02-12 15:00:22 +0100 (Tue, 12 Feb 2008) | 1 line
  
  Particle emitters are now activated after the parent particle has moved instead of before (small change which allows a little trick to create polar emitters)
........
  r3887 | umperio | 2008-02-12 20:49:37 +0100 (Tue, 12 Feb 2008) | 1 line
  
  Made pathfinding not halt on collision destination tile, made moving around with mouse smoother. Added possibility to pass through players with key controls.
........
  r3888 | crush_tmw | 2008-02-13 21:49:55 +0100 (Wed, 13 Feb 2008) | 1 line
  
  Added new headgears by Black Don (thanks to QOAL for testing and implementation)
........
  r3891 | umperio | 2008-02-18 09:52:06 +0100 (Mon, 18 Feb 2008) | 1 line
  
  Fixed image name.
........
  r3892 | umperio | 2008-02-18 11:00:45 +0100 (Mon, 18 Feb 2008) | 1 line
  
  Forgot a %s
........
  r3899 | crush_tmw | 2008-02-19 14:23:34 +0100 (Tue, 19 Feb 2008) | 1 line
  
  Map fixes at snake dungeon by QOAL
........
  r3900 | crush_tmw | 2008-02-19 14:32:24 +0100 (Tue, 19 Feb 2008) | 1 line
  
  More map fixes at snake dungeon by QOAL
........

1 files changed, 10 insertions, 8 deletions

diff --git a/src/player.h b/src/player.h
index 76d6b460..4949783e 100644
--- a/src/player.h
+++ b/src/player.h
@@ -101,34 +101,36 @@ class Player : public Being
         void removeGuild(int id);
 
         /**
-         * Returns a pointer to the specified guild
+         * Returns a pointer to the specified guild.
          */
         Guild* getGuild(const std::string &guildName);
 
         /**
-         * Returns a pointer to the guild with matching id
+         * Returns a pointer to the guild with matching id.
          */
         Guild* getGuild(int id);
 
         /**
-         * Get number of guilds the player belongs to
+         * Get number of guilds the player belongs to.
          */
         short getNumberOfGuilds();
 
         /**
-         * Gets the way the character is blocked by other objects
+         * Gets the way the character is blocked by other objects.
          */
         virtual unsigned char getWalkMask() const
-        { return 0x82; } // blocked by walls and monsters ( bin 1000 0010)
+        { return 0x82; } // blocked by walls and monsters (bin 1000 0010)
 
     protected:
-        // Character guild information
-        std::map<int, Guild*> mGuilds;
         /**
-         * Gets the way the monster blocks pathfinding for other objects
+         * Gets the way the monster blocks pathfinding for other objects.
          */
         virtual Map::BlockType getBlockType() const
         { return Map::BLOCKTYPE_CHARACTER; }
+
+        // Character guild information
+        std::map<int, Guild*> mGuilds;
+
     private:
         Gender mGender;
         Uint8 mHairStyle;