summaryrefslogtreecommitdiff
path: root/src/game-server/character.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
commitd4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (patch)
tree474ec7369f0d367d7780f73901d38d1daec4d2eb /src/game-server/character.cpp
parent2c14cd30ecbacbd5a808cb2641d40f6d568ec294 (diff)
downloadmanaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.gz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.bz2
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.xz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.zip
Use nullptr instead of NULL everywhere
Diffstat (limited to 'src/game-server/character.cpp')
-rw-r--r--src/game-server/character.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp
index d0bcf467..52cc73f9 100644
--- a/src/game-server/character.cpp
+++ b/src/game-server/character.cpp
@@ -72,9 +72,9 @@ static bool executeCallback(Script::Ref function, Entity &entity)
CharacterComponent::CharacterComponent(Entity &entity, MessageIn &msg):
- mClient(NULL),
+ mClient(nullptr),
mConnected(true),
- mTransactionHandler(NULL),
+ mTransactionHandler(nullptr),
mSpecialUpdateNeeded(false),
mDatabaseID(-1),
mHairStyle(0),
@@ -374,13 +374,13 @@ void CharacterComponent::cancelTransaction()
Trade *CharacterComponent::getTrading() const
{
return mTransaction == TRANS_TRADE
- ? static_cast< Trade * >(mTransactionHandler) : NULL;
+ ? static_cast< Trade * >(mTransactionHandler) : nullptr;
}
BuySell *CharacterComponent::getBuySell() const
{
return mTransaction == TRANS_BUYSELL
- ? static_cast< BuySell * >(mTransactionHandler) : NULL;
+ ? static_cast< BuySell * >(mTransactionHandler) : nullptr;
}
void CharacterComponent::setTrading(Trade *t)