3 files changed, 21 insertions, 21 deletions

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 739e2397d..ab0af709e 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/eathena/beinghandler.h"
 
-#include "actorspritemanager.h"
+#include "actormanager.h"
 #include "client.h"
 #include "guild.h"
 #include "guildmanager.h"
@@ -244,7 +244,7 @@ void BeingHandler::undress(Being *const being) const
 void BeingHandler::processBeingChangeLook(Net::MessageIn &msg,
                                           const bool look2) const
 {
-    if (!actorSpriteManager)
+    if (!actorManager)
         return;
 
     /*
@@ -259,7 +259,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg,
       * 16 bit value will be 0.
       */
 
-    Being *const dstBeing = actorSpriteManager->findBeing(msg.readInt32());
+    Being *const dstBeing = actorManager->findBeing(msg.readInt32());
     if (!dstBeing)
         return;
 
@@ -379,13 +379,13 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg,
 
 void BeingHandler::processNameResponse2(Net::MessageIn &msg) const
 {
-    if (!actorSpriteManager || !player_node)
+    if (!actorManager || !player_node)
         return;
 
     const int len = msg.readInt16();
     const int beingId = msg.readInt32();
     const std::string str = msg.readString(len - 8);
-    Being *const dstBeing = actorSpriteManager->findBeing(beingId);
+    Being *const dstBeing = actorManager->findBeing(beingId);
     if (dstBeing)
     {
         if (beingId == player_node->getId())
@@ -421,7 +421,7 @@ void BeingHandler::processNameResponse2(Net::MessageIn &msg) const
 void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
                                            const int msgType) const
 {
-    if (!actorSpriteManager || !player_node)
+    if (!actorManager || !player_node)
         return;
 
     // An update about a player, potentially including movement.
@@ -436,11 +436,11 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
     if (id < 110000000 && job >= 1000)
         disguiseId = job;
 
-    Being *dstBeing = actorSpriteManager->findBeing(id);
+    Being *dstBeing = actorManager->findBeing(id);
 
     if (!dstBeing)
     {
-        if (actorSpriteManager->isBlocked(id) == true)
+        if (actorManager->isBlocked(id) == true)
             return;
 
         dstBeing = createBeing(id, job);
@@ -450,7 +450,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
     }
     else if (disguiseId)
     {
-        actorSpriteManager->undelete(dstBeing);
+        actorManager->undelete(dstBeing);
         if (serverVersion < 1)
             requestNameById(id);
     }
@@ -625,7 +625,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
 void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
                                              const bool visible)
 {
-    if (!actorSpriteManager)
+    if (!actorManager)
         return;
 
     if (visible)
@@ -645,13 +645,13 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
     statusEffects |= (static_cast<uint32_t>(msg.readInt16())) << 16;  // option
     const int16_t job = msg.readInt16();  // class
 
-    Being *dstBeing = actorSpriteManager->findBeing(id);
+    Being *dstBeing = actorManager->findBeing(id);
 
     if (dstBeing && dstBeing->getType() == Being::MONSTER
         && !dstBeing->isAlive())
     {
-        actorSpriteManager->destroy(dstBeing);
-        actorSpriteManager->erase(dstBeing);
+        actorManager->destroy(dstBeing);
+        actorManager->erase(dstBeing);
         dstBeing = nullptr;
     }
 
@@ -662,7 +662,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
         if (job == 0 && id >= 110000000)
             return;
 
-        if (actorSpriteManager->isBlocked(id) == true)
+        if (actorManager->isBlocked(id) == true)
             return;
 
         dstBeing = createBeing(id, job);
@@ -677,7 +677,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
     {
         // undeleting marked for deletion being
         if (dstBeing->getType() == Being::NPC)
-            actorSpriteManager->undelete(dstBeing);
+            actorManager->undelete(dstBeing);
     }
 
     if (dstBeing->getType() == Being::PLAYER)
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 63b5aaea2..7a682105f 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/eathena/guildhandler.h"
 
-#include "actorspritemanager.h"
+#include "actormanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -202,10 +202,10 @@ void GuildHandler::create(const std::string &name) const
 void GuildHandler::invite(const int guildId A_UNUSED,
                           const std::string &name A_UNUSED) const
 {
-    if (!actorSpriteManager)
+    if (!actorManager)
         return;
 
-    const Being *const being = actorSpriteManager->findBeingByName(
+    const Being *const being = actorManager->findBeingByName(
         name, Being::PLAYER);
     if (being)
     {
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 2508c8556..8af0e4aaa 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/eathena/partyhandler.h"
 
-#include "actorspritemanager.h"
+#include "actormanager.h"
 #include "notifications.h"
 #include "notifymanager.h"
 
@@ -120,10 +120,10 @@ void PartyHandler::invite(Being *const being) const
 
 void PartyHandler::invite(const std::string &name) const
 {
-    if (!actorSpriteManager)
+    if (!actorManager)
         return;
 
-    const Being *const being = actorSpriteManager->findBeingByName(
+    const Being *const being = actorManager->findBeingByName(
         name, Being::PLAYER);
     if (being)
     {