From 2aa9b09d4dfa139941c5a0e1e72acd11f9f4fca2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 24 Aug 2016 01:53:38 +0300 Subject: Remove some more local pet related code. --- src/being/being.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index f82fc4dfe..6cb9f8366 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -207,7 +207,6 @@ Being::Being(const BeingId id, mComment(), mBuyBoard(), mSellBoard(), - mPets(), mOwner(nullptr), mSpecialParticle(nullptr), mChat(nullptr), @@ -339,18 +338,6 @@ Being::~Being() delete2(mChat); removeHorse(); - FOR_EACH (std::vector::iterator, it, mPets) - { - Being *pet = *it; - if (pet) - { - pet->setOwner(nullptr); - actorManager->erase(pet); - delete pet; - } - } - mPets.clear(); - removeAllItemsParticles(); mSpiritParticles.clear(); } @@ -1904,13 +1891,6 @@ void Being::logic() restrict2 actorManager->destroy(this); } - FOR_EACH (std::vector::iterator, it, mPets) - { - Being *const pet = *it; - if (pet) - pet->petLogic(); - } - const SoundInfo *restrict const sound = mNextSound.sound; if (sound) { @@ -4643,17 +4623,6 @@ void Being::addEffect(const std::string &restrict name) restrict2 paths.getStringValue("sprites") + name); } -Being *Being::findChildPet(const BeingId id) restrict2 -{ - FOR_EACH (std::vector::iterator, it, mPets) - { - Being *restrict const pet = *it; - if (pet && pet->mId == id) - return pet; - } - return nullptr; -} - void Being::fixPetSpawnPos(int &restrict dstX, int &restrict dstY) const { -- cgit v1.2.3-70-g09d2