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, 6 insertions, 1 deletions

diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index 8ff9ff39..76364ea5 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -67,10 +67,15 @@ class ActorSpriteManager
         FloorItem *createItem(int id, int itemId, const Vector &position);
 
         /**
+         * Immediately destroys the given \a actor.
+         */
+        void destroyActor(ActorSprite *actor);
+
+        /**
          * Destroys the given ActorSprite at the end of
          * ActorSpriteManager::logic.
          */
-        void destroy(ActorSprite *actor);
+        void scheduleDelete(ActorSprite *actor);
 
         /**
          * Returns a specific Being, by id;