summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-04 21:48:28 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-04 21:48:28 +0300
commit81b5f0f63bea5728feb6d8c33d4285fdc0641265 (patch)
treec56e628bc022e1f86a24d2f7f0b9b3c677bde617
parent1a31d0573e3e714664631ac40686c0d61b4bccc9 (diff)
downloadplus-81b5f0f63bea5728feb6d8c33d4285fdc0641265.tar.gz
plus-81b5f0f63bea5728feb6d8c33d4285fdc0641265.tar.bz2
plus-81b5f0f63bea5728feb6d8c33d4285fdc0641265.tar.xz
plus-81b5f0f63bea5728feb6d8c33d4285fdc0641265.zip
Remove getter empty from compoundsprite.
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/compoundsprite.h3
-rw-r--r--src/gui/windows/npcdialog.cpp2
3 files changed, 2 insertions, 5 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index b9ab7a8d9..eab902537 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -294,7 +294,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
}
// Ensure that something is shown, if desired
- if (empty() && forceDisplay == ForceDisplay_true)
+ if (mSprites.empty() && forceDisplay == ForceDisplay_true)
{
if (display.image.empty())
{
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index 53a2f189c..4f168b9fd 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -75,9 +75,6 @@ class CompoundSprite notfinal : public Sprite
unsigned int getFrameCount() const override final A_WARN_UNUSED;
- bool empty() const A_WARN_UNUSED
- { return mSprites.empty(); }
-
void addSprite(Sprite *const sprite);
void setSprite(const size_t layer, Sprite *const sprite);
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 7f34d9f6e..69f024f50 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -1149,7 +1149,7 @@ void NpcDialog::showAvatar(const BeingTypeId avatarId)
avatarId,
nullptr);
mPlayerBox->setPlayer(mAvatarBeing);
- if (!mAvatarBeing->empty())
+ if (!mAvatarBeing->mSprites.empty())
{
mAvatarBeing->logic();
const BeingInfo *const info = AvatarDB::get(avatarId);