diff options
Diffstat (limited to 'src/actorsprite.cpp')
| -rw-r--r-- | src/actorsprite.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 6155bb7af..2a92cf506 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -53,18 +53,18 @@ ActorSprite::ActorSprite(int id): mStatusParticleEffects(&mStunParticleEffects, false), mChildParticleEffects(&mStatusParticleEffects, false), mMustResetParticles(false), - mUsedTargetCursor(0) + mUsedTargetCursor(nullptr) { } ActorSprite::~ActorSprite() { - setMap(0); + setMap(nullptr); - mUsedTargetCursor = 0; + mUsedTargetCursor = nullptr; if (player_node && player_node->getTarget() == this) - player_node->setTarget(0); + player_node->setTarget(nullptr); // Notify listeners of the destruction. for (ActorSpriteListenerIterator iter = mActorSpriteListeners.begin(), @@ -160,7 +160,7 @@ struct EffectDescription std::string mSFXEffect; }; -static EffectDescription *default_effect = 0; +static EffectDescription *default_effect = nullptr; static std::map<int, EffectDescription *> effects; static bool effects_initialized = false; @@ -186,7 +186,7 @@ static EffectDescription *getEffectDescription(int effectId) { logger->log1("Error loading being effects file: " EFFECTS_FILE); - return NULL; + return nullptr; } for_each_xml_child_node(node, root) @@ -462,12 +462,12 @@ void ActorSprite::cleanupTargetCursors() if (targetCursor[type][size]) { delete targetCursor[type][size]; - targetCursor[type][size] = 0; + targetCursor[type][size] = nullptr; } if (targetCursorImages[type][size]) { targetCursorImages[type][size]->decRef(); - targetCursorImages[type][size] = 0; + targetCursorImages[type][size] = nullptr; } } } @@ -503,7 +503,7 @@ void ActorSprite::loadTargetCursor(const std::string &filename, if (targetCursor[type][size]) { delete targetCursor[type][size]; - targetCursor[type][size] = 0; + targetCursor[type][size] = nullptr; if (targetCursorImages[type][size]) targetCursorImages[type][size]->decRef(); } |