From b726bb81f2e1d0bebbef43e8e7ade541745535e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 26 Dec 2013 23:01:18 +0300 Subject: Show popup on pets. --- src/being/being.cpp | 1 + src/gui/viewport.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/being/being.cpp b/src/being/being.cpp index e7610d12d..2640379aa 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -296,6 +296,7 @@ void Being::setSubtype(const uint16_t subtype, const uint8_t look) mInfo = PETDB::get(mId); if (mInfo) { + setName(mInfo->getName()); setupSpriteDisplay(mInfo->getDisplay(), false); mYDiff = mInfo->getSortOffsetY(); const int speed = mInfo->getWalkSpeed(); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index d2dddb4d8..e214fc4a8 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -849,7 +849,8 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) mHoverBeing = actorManager->findBeingByPixel(x, y, true); if (mHoverBeing && (mHoverBeing->getType() == Being::PLAYER - || mHoverBeing->getType() == Being::NPC)) + || mHoverBeing->getType() == Being::NPC + || mHoverBeing->getType() == Being::PET)) { mTextPopup->setVisible(false); if (mShowBeingPopup) -- cgit v1.2.3-70-g09d2