diff options
| author | David Athay <ko2fan@gmail.com> | 2008-08-18 11:51:43 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-08-18 11:51:43 +0000 |
| commit | 6652688b1f72920a9b0d43a83f40f010e11198c2 (patch) | |
| tree | d48d3aa7265fa76b71c56445411317c6470a3c83 | |
| parent | 35dcb50b5fefae76c5d9a88ffc27faaa96eaa9eb (diff) | |
| download | manaserv-6652688b1f72920a9b0d43a83f40f010e11198c2.tar.gz manaserv-6652688b1f72920a9b0d43a83f40f010e11198c2.tar.bz2 manaserv-6652688b1f72920a9b0d43a83f40f010e11198c2.tar.xz manaserv-6652688b1f72920a9b0d43a83f40f010e11198c2.zip | |
Misc fixes with guild
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/account-server/dalstorage.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/chathandler.cpp | 6 | ||||
| -rw-r--r-- | src/chat-server/guild.hpp | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2008-08-18 David Athay <ko2fan@gmail.com> + + * src/account-server/dalstorage.cpp, src/chat-server/guild.hpp, + src/chat-server/chathandler.cpp: Misc fixes of guild. + 2008-08-13 Yohann Ferreira <bertram@cegetel.net> * src/game-server/gamehandler.cpp, src/game-server/map.hpp: diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp index aa29319f..42a35467 100644 --- a/src/account-server/dalstorage.cpp +++ b/src/account-server/dalstorage.cpp @@ -1000,10 +1000,10 @@ std::list<Guild*> DALStorage::getGuildList() guilds.push_back(guild); } string_to< unsigned > toUint; + /** * Add the members to the guilds. */ - for (std::list<Guild*>::iterator itr = guilds.begin(); itr != guilds.end(); ++itr) diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 43a917ff..d19aa8cf 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -695,8 +695,10 @@ ChatHandler::handleGuildRetrieveMembers(ChatClient &client, MessageIn &msg) { reply.writeByte(ERRMSG_OK); reply.writeShort(guildId); - for(std::list<GuildMember*>::const_iterator itr = guild->getMembers().begin(); - itr != guild->getMembers().end(); ++itr) + std::list<GuildMember*> memberList = guild->getMembers(); + std::list<GuildMember*>::const_iterator itr_end = memberList.end(); + for(std::list<GuildMember*>::iterator itr = memberList.begin(); + itr != itr_end; ++itr) { reply.writeString((*itr)->getName()); reply.writeByte(mPlayerMap.find((*itr)->getName()) != mPlayerMap.end()); diff --git a/src/chat-server/guild.hpp b/src/chat-server/guild.hpp index ae8120f4..050dc17f 100644 --- a/src/chat-server/guild.hpp +++ b/src/chat-server/guild.hpp @@ -124,7 +124,7 @@ class Guild /** * Returns the name of the guild. */ - const std::string& getName() const + std::string getName() const { return mName; } /** |