X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.cpp;h=1407cad7c986f2f2b98d806d9245c90c57d77460;hb=d7c5c7b89d46b286c1829f4b39db9e9ccc7417a1;hp=47e09c5325e04401b5c6be9f25ff3c0d3411788e;hpb=c38211432b49e261d1f164d1b04b8f8f1ffcf9d4;p=supertux.git

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index 47e09c532..1407cad7c 100644
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -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,33 +12,42 @@
 //  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/>.
 
-#include <config.h>
+#include "trigger/trigger_base.hpp"
 
-#include "trigger_base.hpp"
-#include "video/drawing_context.hpp"
 #include "object/player.hpp"
+#include "sprite/sprite.hpp"
 
-TriggerBase::TriggerBase()
-  : sprite(0), lasthit(false), hit(false), losetouch_listener(0)
+TriggerBase::TriggerBase() :
+  sprite(),
+  lasthit(false),
+  hit(false),
+  losetouch_listeners()
 {
   set_group(COLGROUP_TOUCHABLE);
 }
 
 TriggerBase::~TriggerBase()
 {
+  // unregister remove_listener hooks, so nobody will try to call us after we've been destroyed
+  for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); i++) {
+    Player* p = *i;
+    p->del_remove_listener(this);
+  }
+  losetouch_listeners.clear();
 }
 
 void
 TriggerBase::update(float )
 {
   if (lasthit && !hit) {
-    if (losetouch_listener) {
-      event(*losetouch_listener, EVENT_LOSETOUCH);
-      losetouch_listener = 0;
+    for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); i++) {
+      Player* p = *i;
+      event(*p, EVENT_LOSETOUCH);
+      p->del_remove_listener(this);
     }
+    losetouch_listeners.clear();
   }
   lasthit = hit;
   hit = false;
@@ -49,7 +56,7 @@ TriggerBase::update(float )
 void
 TriggerBase::draw(DrawingContext& context)
 {
-  if(!sprite)
+  if(!sprite.get())
     return;
 
   sprite->draw(context, get_pos(), LAYER_TILES+1);
@@ -62,7 +69,7 @@ TriggerBase::collision(GameObject& other, const CollisionHit& )
   if(player) {
     hit = true;
     if(!lasthit) {
-      losetouch_listener = player;
+      losetouch_listeners.push_back(player);
       player->add_remove_listener(this);
       event(*player, EVENT_TOUCH);
     }
@@ -70,10 +77,17 @@ TriggerBase::collision(GameObject& other, const CollisionHit& )
 
   return ABORT_MOVE;
 }
-  
-void 
+
+void
 TriggerBase::object_removed(GameObject* object)
 {
-  if (losetouch_listener == object) losetouch_listener = 0;
+  for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); i++) {
+    Player* p = *i;
+    if (p == object) {
+      losetouch_listeners.erase(i);
+      break;
+    }
+  }
 }
 
+/* EOF */