diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-12-26 23:01:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-12-26 23:01:18 +0300 |
| commit | b726bb81f2e1d0bebbef43e8e7ade541745535e9 (patch) | |
| tree | 6446c04e81cfa10cb900470073ec72cbc0027e4e | |
| parent | 38a861c3e5d14ad3c1db04be8c65e84966758d88 (diff) | |
| download | manaplus-b726bb81f2e1d0bebbef43e8e7ade541745535e9.tar.gz manaplus-b726bb81f2e1d0bebbef43e8e7ade541745535e9.tar.bz2 manaplus-b726bb81f2e1d0bebbef43e8e7ade541745535e9.tar.xz manaplus-b726bb81f2e1d0bebbef43e8e7ade541745535e9.zip | |
Show popup on pets.
| -rw-r--r-- | src/being/being.cpp | 1 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
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) |