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.h | |
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.h')
-rw-r--r-- | src/actorspritemanager.h | 7 |
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; |