summaryrefslogtreecommitdiff
path: root/src/actorspritemanager.h
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
committerPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
commit05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch)
treeaf83e22418e912e8eb8b2bc6b9595da344f461c1 /src/actorspritemanager.h
parent703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff)
parentf9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff)
downloadmana-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.h7
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;