summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-07 15:39:21 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-07 15:39:21 +0300
commiteea33c9a746a7e44f7f61d13d679c9c9535a7244 (patch)
tree1bcc9a1d27e67e3d1a7193c3dcf48ad50c2229a1
parent85e6c889657721c0b2314c699a4989fb382c7c40 (diff)
downloadmanaverse-eea33c9a746a7e44f7f61d13d679c9c9535a7244.tar.gz
manaverse-eea33c9a746a7e44f7f61d13d679c9c9535a7244.tar.bz2
manaverse-eea33c9a746a7e44f7f61d13d679c9c9535a7244.tar.xz
manaverse-eea33c9a746a7e44f7f61d13d679c9c9535a7244.zip
Remove some unused functions from compoundsprite.
-rw-r--r--src/being/compoundsprite.cpp32
-rw-r--r--src/being/compoundsprite.h14
2 files changed, 2 insertions, 44 deletions
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index de0e9ef24..f19b479a6 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -300,7 +300,7 @@ void CompoundSprite::clear()
mLastTime = 0;
}
-void CompoundSprite::ensureSize(size_t layerCount)
+void CompoundSprite::ensureSize(const size_t layerCount)
{
// Skip if it won't change anything
if (mSprites.size() >= layerCount)
@@ -310,36 +310,6 @@ void CompoundSprite::ensureSize(size_t layerCount)
mSprites.resize(layerCount);
}
-/**
- * Returns the curent frame in the current animation of the given layer.
- */
-unsigned int CompoundSprite::getCurrentFrame(unsigned int layer) const
-{
- if (layer >= CAST_U32(mSprites.size()))
- return 0;
-
- const Sprite *const s = mSprites[layer];
- if (s)
- return s->getCurrentFrame();
-
- return 0;
-}
-
-/**
- * Returns the frame count in the current animation of the given layer.
- */
-unsigned int CompoundSprite::getFrameCount(unsigned int layer)
-{
- if (layer >= CAST_U32(mSprites.size()))
- return 0;
-
- const Sprite *const s = mSprites[layer];
- if (s)
- return s->getFrameCount();
-
- return 0;
-}
-
void CompoundSprite::redraw() const
{
#ifndef USE_SDL2
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index 4f168b9fd..d50f20b2d 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -83,7 +83,7 @@ class CompoundSprite notfinal : public Sprite
void clear();
- void ensureSize(size_t layerCount);
+ void ensureSize(const size_t layerCount);
virtual void drawSprites(Graphics *const graphics,
const int posX,
@@ -93,18 +93,6 @@ class CompoundSprite notfinal : public Sprite
const int posX,
const int posY) const;
- /**
- * Returns the curent frame in the current animation of the given
- * layer.
- */
- virtual unsigned int getCurrentFrame(unsigned int layer)
- const A_WARN_UNUSED;
-
- /**
- * Returns the frame count in the current animation of the given layer.
- */
- virtual unsigned int getFrameCount(unsigned int layer) A_WARN_UNUSED;
-
void setAlpha(float alpha) override;
bool updateNumber(const unsigned num) override final;