diff options
| author | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
|---|---|---|
| committer | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
| commit | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch) | |
| tree | af83e22418e912e8eb8b2bc6b9595da344f461c1 /src/actorspritemanager.cpp | |
| parent | 703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff) | |
| parent | f9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff) | |
| download | mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.gz mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.bz2 mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.xz mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.zip | |
Merge remote-tracking branch 'origin/master' into lpc2012 branch
Diffstat (limited to 'src/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 9 |
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; |