diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-03 21:17:50 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-11 13:42:59 +0200 |
| commit | d95fccfca8575d8fb06988e558a338e37776961a (patch) | |
| tree | 6d7200a55ae910357311ef35295387fbb6969095 /src/chat-server/guildhandler.cpp | |
| parent | c1ba76b936c04dbdcdcc3ed86f919a949c8aa63f (diff) | |
| download | manaserv-d95fccfca8575d8fb06988e558a338e37776961a.tar.gz manaserv-d95fccfca8575d8fb06988e558a338e37776961a.tar.xz manaserv-d95fccfca8575d8fb06988e558a338e37776961a.zip | |
Renamed Character -> CharacterData in the accountserver
Diffstat (limited to 'src/chat-server/guildhandler.cpp')
| -rw-r--r-- | src/chat-server/guildhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<GuildMember*>::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<GuildMember*>::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) { |