summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-19 16:27:33 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 16:30:24 +0300
commit6c3974a46c659e558b2b5f249b7b000a5b39fe25 (patch)
tree6ba5ad594cc0691821f879efff413c562f7cc552 /src/being/being.cpp
parent4f77307d659c4048c20eacda1d5b13fcce8d60da (diff)
downloadmv-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.gz
mv-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.bz2
mv-6c3974a46c659e558b2b5f249b7b000a5b39fe25.tar.xz
mv-6c3974a46c659e558b2b5f249b7b000a5b39fe25.zip
Rename actorspritemanager into actormanager.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 556341062..fdd706bbe 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -22,7 +22,7 @@
#include "being/being.h"
-#include "actorspritemanager.h"
+#include "actormanager.h"
#include "animatedsprite.h"
#include "beingequipbackend.h"
#include "client.h"
@@ -1572,8 +1572,8 @@ void Being::logic()
&& static_cast<int> ((static_cast<float>(get_elapsed_time(mActionTime))
/ mSpeed)) >= frameCount)
{
- if (mType != PLAYER && actorSpriteManager)
- actorSpriteManager->destroy(this);
+ if (mType != PLAYER && actorManager)
+ actorManager->destroy(this);
}
const SoundInfo *const sound = mNextSound.sound;
@@ -2991,11 +2991,11 @@ void Being::addEffect(const std::string &name)
void Being::addPet(const int id)
{
- if (!actorSpriteManager)
+ if (!actorManager)
return;
removePet();
- Being *const being = actorSpriteManager->createBeing(
+ Being *const being = actorManager->createBeing(
id, ActorSprite::PET, 0);
if (being)
{
@@ -3008,14 +3008,14 @@ void Being::addPet(const int id)
void Being::removePet()
{
- if (!actorSpriteManager)
+ if (!actorManager)
return;
mPetId = 0;
if (mPet)
{
mPet->setOwner(nullptr);
- actorSpriteManager->destroy(mPet);
+ actorManager->destroy(mPet);
mPet = nullptr;
}
}