summaryrefslogtreecommitdiff
path: root/src/game-server/state.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-27 23:30:18 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-27 23:30:18 +0200
commit5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch)
treede739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/game-server/state.cpp
parentc53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff)
parentd4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff)
downloadmanaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r--src/game-server/state.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index 58d848de..db224b84 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -845,7 +845,7 @@ void GameState::sayTo(Entity *destination, Entity *source, const std::string &te
return; //only characters will read it anyway
MessageOut msg(GPMSG_SAY);
- if (source == NULL)
+ if (source == nullptr)
{
msg.writeInt16(0);
}