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 47e09c5..a221b29 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -22,25 +22,34 @@
 #include "trigger_base.hpp"
 #include "video/drawing_context.hpp"
 #include "object/player.hpp"
+#include "log.hpp"
 
 TriggerBase::TriggerBase()
-  : sprite(0), lasthit(false), hit(false), losetouch_listener(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) {
-    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;
@@ -62,7 +71,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);
     }
@@ -74,6 +83,12 @@ TriggerBase::collision(GameObject& other, const CollisionHit& )
 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;
+    }
+  }
 }