summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-01 00:11:22 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-01 00:11:22 +0300
commit2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c (patch)
tree9f6f720d09d26694af658e53f00043d24b1a507d
parentf52dab5137717821aafa7be92a01464d67498d64 (diff)
downloadplus-2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c.tar.gz
plus-2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c.tar.bz2
plus-2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c.tar.xz
plus-2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c.zip
Fix pet popup. For not own pets now show pet info and size always correct.
-rw-r--r--src/gui/popups/beingpopup.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index d8d92f388..5ca2a76be 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -170,7 +170,7 @@ void BeingPopup::show(const int x, const int y, Being *const b)
if (type == ActorType::Pet)
{
const PetInfo *const info = PlayerInfo::getPet();
- if (info)
+ if (info && info->id == b->getId())
{
// TRANSLATORS: being popup label
label1->setCaption(strprintf(_("Hungry: %d"),
@@ -187,6 +187,17 @@ void BeingPopup::show(const int x, const int y, Being *const b)
label7 = nullptr;
label8 = nullptr;
}
+ else
+ {
+ label1 = nullptr;
+ label2 = nullptr;
+ label3 = nullptr;
+ label4 = nullptr;
+ label5 = nullptr;
+ label6 = nullptr;
+ label7 = nullptr;
+ label8 = nullptr;
+ }
}
else if (type == ActorType::Homunculus)
{