summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-11 23:00:47 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-11 23:00:47 +0300
commit0fa192854595ebe03cce54ad2b251abc4c8e8827 (patch)
treeb0129f65bc0a70926adea202756d0794db974980 /src/gui/windows
parentf9209b4a764e85a7ae0e40eee654b543d2ccf2ae (diff)
downloadplus-0fa192854595ebe03cce54ad2b251abc4c8e8827.tar.gz
plus-0fa192854595ebe03cce54ad2b251abc4c8e8827.tar.bz2
plus-0fa192854595ebe03cce54ad2b251abc4c8e8827.tar.xz
plus-0fa192854595ebe03cce54ad2b251abc4c8e8827.zip
add support for multiply pets for one player at same time.
But one item still can have only one pet.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/chatwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 015e58b61..c434bea2f 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1577,7 +1577,7 @@ void ChatWindow::localPetSay(const std::string &nick, const std::string &text)
Being *pet = nullptr;
if (being)
{
- pet = being->getPet();
+ pet = being->getFirstPet();
if (pet)
pet->setSpeech(text, GENERAL_CHANNEL);
}
@@ -1601,7 +1601,7 @@ void ChatWindow::localPetEmote(const std::string &nick, const uint8_t emoteId)
nick, ActorSprite::PLAYER);
if (being)
{
- Being *const pet = being->getPet();
+ Being *const pet = being->getFirstPet();
if (pet)
pet->setEmote(emoteId, 0);
}