summaryrefslogtreecommitdiff
path: root/src/actorsprite.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
commit4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch)
tree714897eca03fbcb764f5b450a29cc1aef8d33433 /src/actorsprite.cpp
parent9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff)
downloadmv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz
mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2
mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz
mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/actorsprite.cpp')
-rw-r--r--src/actorsprite.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index ea24513e1..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;
@@ -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();
}