From d95fccfca8575d8fb06988e558a338e37776961a Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Wed, 3 Apr 2013 21:17:50 +0200 Subject: Renamed Character -> CharacterData in the accountserver --- src/chat-server/guildhandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/chat-server/guildhandler.cpp') diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index 1bbe367..da66676 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -127,7 +127,7 @@ void ChatHandler::sendGuildListUpdate(Guild *guild, for (std::list::const_iterator itr = members.begin(); itr != members.end(); ++itr) { - Character *c = storage->getCharacter((*itr)->mId, NULL); + CharacterData *c = storage->getCharacter((*itr)->mId, nullptr); chr = mPlayerMap.find(c->getName()); if (chr != mPlayerMap.end()) { @@ -293,7 +293,7 @@ void ChatHandler::handleGuildGetMembers(ChatClient &client, MessageIn &msg) for (std::list::iterator itr = memberList.begin(); itr != itr_end; ++itr) { - Character *c = storage->getCharacter((*itr)->mId, NULL); + CharacterData *c = storage->getCharacter((*itr)->mId, nullptr); std::string memberName = c->getName(); reply.writeString(memberName); reply.writeInt8(mPlayerMap.find(memberName) != mPlayerMap.end()); @@ -318,7 +318,7 @@ void ChatHandler::handleGuildMemberLevelChange(ChatClient &client, std::string user = msg.readString(); short level = msg.readInt8(); Guild *guild = guildManager->findById(guildId); - Character *c = storage->getCharacter(user); + CharacterData *c = storage->getCharacter(user); if (guild && c) { -- cgit