summaryrefslogtreecommitdiff
path: root/src/resources/sprite
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-21 22:44:29 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-21 22:45:15 +0300
commit42f47e483da19079a937c4801ca94bd62d8dc970 (patch)
tree56dc96737e01e04d54357ce7118de3a1f000c516 /src/resources/sprite
parent2d8b9246c8003f1d32ba396bc19cc11bc5a595b2 (diff)
downloadmanaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.gz
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.bz2
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.tar.xz
manaplus-42f47e483da19079a937c4801ca94bd62d8dc970.zip
Remove useless else.
Diffstat (limited to 'src/resources/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.cpp9
-rw-r--r--src/resources/sprite/spritedef.cpp3
2 files changed, 4 insertions, 8 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index d2dbc1b72..4905f2f3e 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -383,24 +383,21 @@ unsigned int AnimatedSprite::getFrameCount() const restrict2
{
if (mAnimation != nullptr)
return CAST_U32(mAnimation->getLength());
- else
- return 0;
+ return 0;
}
int AnimatedSprite::getWidth() const restrict2
{
if ((mFrame != nullptr) && (mFrame->image != nullptr))
return mFrame->image->mBounds.w;
- else
- return 0;
+ return 0;
}
int AnimatedSprite::getHeight() const restrict2
{
if ((mFrame != nullptr) && (mFrame->image != nullptr))
return mFrame->image->mBounds.h;
- else
- return 0;
+ return 0;
}
std::string AnimatedSprite::getIdPath() const restrict2
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index ccb8af30c..5fdb68584 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -112,8 +112,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile,
doc->decRef();
if (animationFile != errorFile)
return load(errorFile, 0, prot);
- else
- return nullptr;
+ return nullptr;
}
SpriteDef *const def = new SpriteDef;