X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.hpp;h=d2fb236b129a312b1019e51f68f1ed12d7e9a838;hb=590d47c3c3cf4641d97ee1579af69edbc355e5a8;hp=887f413a5c5c4ccca58cdbf4533f8823ec6a4d25;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/trigger/trigger_base.hpp b/src/trigger/trigger_base.hpp
index 887f413a5..d2fb236b1 100644
--- a/src/trigger/trigger_base.hpp
+++ b/src/trigger/trigger_base.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,26 +12,31 @@
 //  GNU General Public License for more details.
 //
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_TRIGGER_TRIGGER_BASE_HPP
+#define HEADER_SUPERTUX_TRIGGER_TRIGGER_BASE_HPP
 
-#ifndef SUPERTUX_TRIGGER_BASE_H
-#define SUPERTUX_TRIGGER_BASE_H
+#include <list>
+#include <memory>
 
-#include "moving_object.hpp"
-#include "math/rect.hpp"
-#include "sprite/sprite.hpp"
+#include "sprite/sprite_ptr.hpp"
+#include "supertux/moving_object.hpp"
+#include "supertux/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();
@@ -48,10 +51,23 @@ public:
    */
   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;
+  SpritePtr sprite;
   bool lasthit;
   bool hit;
+
+  std::list<Player*> losetouch_listeners; /**< Players that will be informed when we lose touch with them */
+
+private:
+  TriggerBase(const TriggerBase&);
+  TriggerBase& operator=(const TriggerBase&);
 };
 
 #endif /*SUPERTUX_INTERACTIVE_OBJECT_H*/
+
+/* EOF */