X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.hpp;h=571dac5b031ee170994f580cfe9857d8fea07b22;hb=89c801d4e00a0be36f6ad693a055505968ef9514;hp=bc7bf02b4270d9e3bed038b112def17e2fb07c47;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/trigger/trigger_base.hpp b/src/trigger/trigger_base.hpp
index bc7bf02b4..571dac5b0 100644
--- a/src/trigger/trigger_base.hpp
+++ b/src/trigger/trigger_base.hpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -16,42 +16,53 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef SUPERTUX_TRIGGER_BASE_H
 #define SUPERTUX_TRIGGER_BASE_H
 
+#include <list>
 #include "moving_object.hpp"
 #include "math/rect.hpp"
 #include "sprite/sprite.hpp"
+#include "object_remove_listener.hpp"
 
 class Player;
 
 /** This class is the base class for all objects you can interact with in some
  * way. There are several interaction types defined like touch and activate
  */
-class TriggerBase : public MovingObject
+class TriggerBase : public MovingObject, public ObjectRemoveListener
 {
 public:
   enum EventType {
-    EVENT_TOUCH, EVENT_ACTIVATE
+    EVENT_TOUCH,     /**< Object came into contact */
+    EVENT_LOSETOUCH, /**< Lost contact with object */
+    EVENT_ACTIVATE   /**< Action button pressed    */
   };
-  
+
   TriggerBase();
   ~TriggerBase();
 
   void update(float elapsed_time);
   void draw(DrawingContext& context);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
-  
+
   /**
    * Receive trigger events
    */
   virtual void event(Player& player, EventType type) = 0;
+  
+  /**
+   * Called by GameObject destructor of an object in losetouch_listeners
+   */
+  virtual void object_removed(GameObject* object);
 
 private:
   Sprite* sprite;
   bool lasthit;
   bool hit;
+
+  std::list<Player*> losetouch_listeners; /**< Players that will be informed when we lose touch with them */
 };
 
 #endif /*SUPERTUX_INTERACTIVE_OBJECT_H*/
-