diff options
| -rw-r--r-- | src/being/actorsprite.cpp | 2 | ||||
| -rw-r--r-- | src/being/compoundsprite.h | 3 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 |
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); |