summaryrefslogtreecommitdiff
path: root/src/compoundsprite.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/compoundsprite.cpp')
-rw-r--r--src/compoundsprite.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index e96137c4..d77005c7 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -184,7 +184,7 @@ void CompoundSprite::addSprite(Sprite* sprite)
mNeedsRedraw = true;
}
-void CompoundSprite::setSprite(int layer, Sprite* sprite)
+void CompoundSprite::setSprite(int layer, Sprite *sprite)
{
// Skip if it won't change anything
if (at(layer) == sprite)
@@ -199,7 +199,7 @@ void CompoundSprite::setSprite(int layer, Sprite* sprite)
void CompoundSprite::removeSprite(int layer)
{
// Skip if it won't change anything
- if (at(layer) == NULL)
+ if (!at(layer))
return;
delete at(layer);
@@ -223,7 +223,7 @@ void CompoundSprite::ensureSize(size_t layerCount)
if (size() >= layerCount)
return;
- resize(layerCount, NULL);
+ resize(layerCount);
}
/**
@@ -234,8 +234,7 @@ size_t CompoundSprite::getCurrentFrame(size_t layer)
if (layer >= size())
return 0;
- Sprite *s = getSprite(layer);
- if (s)
+ if (Sprite *s = getSprite(layer))
return s->getCurrentFrame();
return 0;