From 2b2196b1aa2919e71dc2cd8b78a068c7e28a0a0c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 1 Mar 2016 00:11:22 +0300 Subject: Fix pet popup. For not own pets now show pet info and size always correct. --- src/gui/popups/beingpopup.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/gui/popups/beingpopup.cpp') 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) { -- cgit v1.2.3-70-g09d2