summaryrefslogtreecommitdiff
path: root/src/chat-server/guildhandler.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-15 22:15:31 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-15 22:15:31 +0200
commitc53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch)
tree1a8174f4d1745a4799210db970aa2230df622d34 /src/chat-server/guildhandler.cpp
parentb89e404f85358f2e3ff87d7731376dbeacdf9778 (diff)
parent81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff)
downloadmanaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz
manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2
manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz
manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip
Merge branch 'master' into lpc2012
Conflicts: src/account-server/accounthandler.cpp src/game-server/character.cpp
Diffstat (limited to 'src/chat-server/guildhandler.cpp')
-rw-r--r--src/chat-server/guildhandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 1bbe3671..da666769 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)
{