Check that the userdata pointer is not null, which happens when a user creates a...

[supertux.git] / src / trigger / trigger_base.cpp

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index e3c2bf1..a221b29 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -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,25 +16,41 @@
 //  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.
+
 #include <config.h>
 
 #include "trigger_base.hpp"
 #include "video/drawing_context.hpp"
 #include "object/player.hpp"
+#include "log.hpp"
 
 TriggerBase::TriggerBase()
-  : sprite(0)
+  : sprite(0), lasthit(false), hit(false)
 {
   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) {
+    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;
 }
@@ -54,10 +70,25 @@ TriggerBase::collision(GameObject& other, const CollisionHit& )
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
     hit = true;
-    if(!lasthit)
+    if(!lasthit) {
+      losetouch_listeners.push_back(player);
+      player->add_remove_listener(this);
       event(*player, EVENT_TOUCH);
+    }
   }
 
   return ABORT_MOVE;
 }
+  
+void 
+TriggerBase::object_removed(GameObject* object)
+{
+  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;
+    }
+  }
+}