Fix crash in picking up an item that no longer exists

Adds ActorSpriteListener to manage ActorSprite destruction as
recommended by Jaxad0127. This likewise includes the changes made by
Bertram.

Reviewed-by: Jaxad0127, Bertram.

Resolves: Manasource Mantis #160

1 files changed, 16 insertions, 0 deletions

diff --git a/src/actorsprite.h b/src/actorsprite.h
index e218ef74..7cc91c53 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -29,9 +29,11 @@
 #include <SDL_types.h>
 
 #include <set>
+#include <list>
 
 class SimpleAnimation;
 class StatusEffect;
+class ActorSpriteListener;
 
 class ActorSprite : public CompoundSprite, public Actor
 {
@@ -160,6 +162,16 @@ public:
 
     static void unload();
 
+    /**
+     * Add an ActorSprite listener.
+     */
+    void addActorSpriteListener(ActorSpriteListener *listener);
+
+    /**
+     * Remove an ActorSprite listener.
+     */
+    void removeActorSpriteListener(ActorSpriteListener *listener);
+
 protected:
     /**
      * Trigger visual effect, with components
@@ -227,6 +239,10 @@ private:
 
     /** Target cursor being used */
     SimpleAnimation *mUsedTargetCursor;
+
+    typedef std::list<ActorSpriteListener*> ActorSpriteListeners;
+    typedef ActorSpriteListeners::iterator ActorSpriteListenerIterator;
+    ActorSpriteListeners mActorSpriteListeners;
 };
 
 #endif // ACTORSPRITE_H