X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgame_object.cpp;h=ee63ec1c1547acc9820a54b1278111ee8da11eae;hb=1411904ec0279f5fb748facd06f7d24a7f9cc538;hp=c9d47bd224e52c6ea61278adfcdfae1ab9a9419f;hpb=42398ef94da66fa3eb3d42aeae45c9076cae99ca;p=supertux.git

diff --git a/src/game_object.cpp b/src/game_object.cpp
index c9d47bd22..ee63ec1c1 100644
--- a/src/game_object.cpp
+++ b/src/game_object.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,14 +16,26 @@
 //  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 "game_object.h"
+
+#include <config.h>
+
+#include "game_object.hpp"
+#include "object_remove_listener.hpp"
 
 GameObject::GameObject()
-  : wants_to_die(false)
+  : wants_to_die(false), remove_listeners(NULL)
 {
 }
 
 GameObject::~GameObject()
 {
+  // call remove listeners (and remove them from the list)
+  RemoveListenerListEntry* entry = remove_listeners;
+  while(entry != NULL) {
+    RemoveListenerListEntry* next = entry->next;
+    entry->listener->object_removed(this);
+    delete entry;
+    entry = next;
+  }
 }