diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 22:10:21 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-05-02 22:15:34 +0200 |
commit | 7fa9db23c67c690f8d96d5bd1ea2d0c39f52a0ac (patch) | |
tree | 21abec05df74cce2357eab7f3c773740b33f6592 /src/being.cpp | |
parent | a6b11834f227b8edbfb39633380806480fd2a2c5 (diff) | |
download | mana-7fa9db23c67c690f8d96d5bd1ea2d0c39f52a0ac.tar.gz mana-7fa9db23c67c690f8d96d5bd1ea2d0c39f52a0ac.tar.bz2 mana-7fa9db23c67c690f8d96d5bd1ea2d0c39f52a0ac.tar.xz mana-7fa9db23c67c690f8d96d5bd1ea2d0c39f52a0ac.zip |
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
Diffstat (limited to 'src/being.cpp')
-rw-r--r-- | src/being.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/being.cpp b/src/being.cpp index 62081bb4..21d48ed2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -892,7 +892,7 @@ void Being::logic() { if (getType() != PLAYER) - actorSpriteManager->destroy(this); + actorSpriteManager->scheduleDelete(this); } } |