Fixed guild support

List of things fixed:
- fixed having multiple guild support everywhere
- implemented kick code (untested due to missing kick possiblity in client)
- fixed giving owner rights to next member when owner leaves guild
- fixed potentional segmention fault when trying to access deleted guild after all members left
- fixed saving right changes to database
- made searching for guilds faster a bit (at least when having many guilds)

TODO:
 + Fix conflict between guild and normal channels
 + Fix being able to leave guild channel without leaving guild itself
 + Add kick possiblity to client

Reviewed-by: bjorn.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/chat-server/guildmanager.h b/src/chat-server/guildmanager.h
index 43085746..06a0e5a4 100644
--- a/src/chat-server/guildmanager.h
+++ b/src/chat-server/guildmanager.h
@@ -56,7 +56,9 @@ class GuildManager
         /**
          * Removes a member from a guild.
          */
-        void removeGuildMember(Guild *guild, int playerId);
+        void removeGuildMember(Guild *guild, int playerId,
+                               const std::string &characterName,
+                               ChatClient *client = 0);
 
         /**
          * Returns the guild with the given id. O(n)
@@ -80,7 +82,7 @@ class GuildManager
         /**
          * Return the guilds a character is in
          */
-        std::vector<Guild*> getGuildsForPlayer(int playerId) const;
+        std::vector<Guild *> getGuildsForPlayer(int playerId) const;
 
         /**
          * Inform guild members that a player has disconnected.
@@ -97,18 +99,12 @@ class GuildManager
                               int playerId, int level);
 
         /**
-         * Check if the player already owns a guild
-         */
-        bool alreadyOwner(int playerId) const;
-
-        /**
          * Set user rights
          */
         void setUserRights(Guild *guild, int playerId, int rights);
 
     private:
         std::map<int, Guild*> mGuilds;
-        std::list<int> mOwners;
 };
 
 extern GuildManager *guildManager;