summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-20 22:04:18 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-20 22:04:18 +0300
commit61653ea26a02841754baf97a1124aeea2b21e101 (patch)
tree9c4cc37a7ad23f2a6e27ebca949bc1e2f474e376
parent8f24400fc10658db9636e6cdd315504d75c71a5d (diff)
downloadmv-61653ea26a02841754baf97a1124aeea2b21e101.tar.gz
mv-61653ea26a02841754baf97a1124aeea2b21e101.tar.bz2
mv-61653ea26a02841754baf97a1124aeea2b21e101.tar.xz
mv-61653ea26a02841754baf97a1124aeea2b21e101.zip
dont add and remove pets for temporary sprites.
-rw-r--r--src/being/being.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index dbe4d7350..f9667ca33 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2164,7 +2164,7 @@ void Being::setSprite(const unsigned int slot, const int id,
if (id1)
{
const ItemInfo &info = ItemDB::get(id1);
- if (mMap && mType == PLAYER)
+ if (!isTempSprite && mMap && mType == PLAYER)
{
const int pet = info.getPet();
if (pet)
@@ -2179,7 +2179,7 @@ void Being::setSprite(const unsigned int slot, const int id,
const std::string filename = info.getSprite(mGender, mSubType);
AnimatedSprite *equipmentSprite = nullptr;
- if (mType == PLAYER)
+ if (!isTempSprite && mType == PLAYER)
{
const int pet = info.getPet();
if (pet)