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/game-server/character.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/game-server/character.cpp')
| -rw-r--r-- | src/game-server/character.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp index dd99e3b1..b16d3977 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) |