diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/chat-server/post.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/chat-server/post.cpp')
| -rw-r--r-- | src/chat-server/post.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chat-server/post.cpp b/src/chat-server/post.cpp index 6db5f768..9da07535 100644 --- a/src/chat-server/post.cpp +++ b/src/chat-server/post.cpp @@ -115,7 +115,7 @@ Letter* Post::getLetter(int letter) const { if (letter < 0 || (size_t) letter > mLetters.size()) { - return NULL; + return nullptr; } return mLetters[letter]; } @@ -146,7 +146,7 @@ void PostManager::addLetter(Letter *letter) Post *PostManager::getPost(CharacterData *player) const { std::map<CharacterData*, Post*>::const_iterator itr = mPostBox.find(player); - return (itr == mPostBox.end()) ? NULL : itr->second; + return (itr == mPostBox.end()) ? nullptr : itr->second; } void PostManager::clearPost(CharacterData *player) |