diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-22 21:30:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-22 21:30:10 +0300 |
| commit | 05099e035729878893845b0598e20109f0c734fe (patch) | |
| tree | 7058923ca824049151442942fc513c5961055af4 | |
| parent | 6394aa39611ce2730f4030a8ac45088ae6f20460 (diff) | |
| download | manaplus-05099e035729878893845b0598e20109f0c734fe.tar.gz manaplus-05099e035729878893845b0598e20109f0c734fe.tar.bz2 manaplus-05099e035729878893845b0598e20109f0c734fe.tar.xz manaplus-05099e035729878893845b0598e20109f0c734fe.zip | |
Show popup menu pet control commands only for pet owner.
| -rw-r--r-- | src/being/being.h | 3 | ||||
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 31 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/being/being.h b/src/being/being.h index b587a8d1f..6e7fb346c 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -840,6 +840,9 @@ class Being notfinal : public ActorSprite, void setOwner(Being *const owner) { mOwner = owner; } + Being *getOwner() const + { return mOwner; } + void unassignPet(const Being *const pet); void removeAllPets(); diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 9a998214f..7816b6887 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -334,20 +334,23 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) break; case ActorType::Pet: - // TRANSLATORS: popup menu item - // TRANSLATORS: feed pet - mBrowserBox->addRow("pet feed", _("Feed")); - // TRANSLATORS: popup menu item - // TRANSLATORS: pet drop loot - mBrowserBox->addRow("pet drop loot", _("Drop loot")); - // TRANSLATORS: popup menu item - // TRANSLATORS: pet unequip item - mBrowserBox->addRow("pet unequip", _("Unequip")); - mBrowserBox->addRow("##3---"); - // TRANSLATORS: popup menu item - // TRANSLATORS: pet return to egg - mBrowserBox->addRow("pet to egg", _("Return to egg")); - mBrowserBox->addRow("##3---"); + if (being->getOwner() == localPlayer) + { + // TRANSLATORS: popup menu item + // TRANSLATORS: feed pet + mBrowserBox->addRow("pet feed", _("Feed")); + // TRANSLATORS: popup menu item + // TRANSLATORS: pet drop loot + mBrowserBox->addRow("pet drop loot", _("Drop loot")); + // TRANSLATORS: popup menu item + // TRANSLATORS: pet unequip item + mBrowserBox->addRow("pet unequip", _("Unequip")); + mBrowserBox->addRow("##3---"); + // TRANSLATORS: popup menu item + // TRANSLATORS: pet return to egg + mBrowserBox->addRow("pet to egg", _("Return to egg")); + mBrowserBox->addRow("##3---"); + } break; case ActorType::Avatar: |