Fixed network layer doing delayed actor deletion

The delayed actor deletion was meant to be used during the logic calls,
to avoid modifying the container while it is being iterated. The
deletions happening from the network layer are not done while iterating
the set of actors, so it can delete immediately.

This fixes an issue where an NPC would disappear when changing
appearance on tmwAthena, because this was implemented as a remove + add,
which broke due to the delayed deletion.

Mantis-issue: 507
Reviewed-by: Jared Adams

1 files changed, 8 insertions, 1 deletions

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 31b6d8f0..7da9fe10 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -138,7 +138,14 @@ FloorItem *ActorSpriteManager::createItem(int id, int itemId, const Vector &pos)
     return floorItem;
 }
 
-void ActorSpriteManager::destroy(ActorSprite *actor)
+void ActorSpriteManager::destroyActor(ActorSprite *actor)
+{
+    mActors.erase(actor);
+    mDeleteActors.erase(actor);
+    delete actor;
+}
+
+void ActorSpriteManager::scheduleDelete(ActorSprite *actor)
 {
     if (!actor || actor == local_player)
         return;