Resolves issue 0000304: Blocks don't return to original positions

[supertux.git] / src / game_object.cpp

diff --git a/src/game_object.cpp b/src/game_object.cpp
index 40d4056..273367f 100644 (file)
--- a/src/game_object.cpp
+++ b/src/game_object.cpp
@@ -1,7 +1,7 @@
-//  $Id: game_object.cpp 2277 2005-01-16 12:11:22Z matzebraun $
+//  $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
@@ -18,12 +18,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
-
-#include "game_object.h"
-#include "object_remove_listener.h"
+#include "log.hpp"
+#include "game_object.hpp"
+#include "object_remove_listener.hpp"
 
 GameObject::GameObject()
-  : wants_to_die(false), remove_listeners(0), flags(0)
+  : wants_to_die(false), remove_listeners(NULL)
 {
 }
 
@@ -31,10 +31,42 @@ GameObject::~GameObject()
 {
   // call remove listeners (and remove them from the list)
   RemoveListenerListEntry* entry = remove_listeners;
-  while(entry != 0) {
+  while(entry != NULL) {
     RemoveListenerListEntry* next = entry->next;
     entry->listener->object_removed(this);
     delete entry;
     entry = next;
   }
 }
+
+ 
+void 
+GameObject::add_remove_listener(ObjectRemoveListener* listener)
+{
+  RemoveListenerListEntry* entry = new RemoveListenerListEntry();
+  entry->next = remove_listeners;
+  entry->listener = listener;
+  remove_listeners = entry;
+}
+
+void
+GameObject::del_remove_listener(ObjectRemoveListener* listener)
+{
+  RemoveListenerListEntry* entry = remove_listeners;
+  if (entry->listener == listener) {
+    remove_listeners = entry->next;
+    delete entry;
+    return;
+  }
+  RemoveListenerListEntry* next = entry->next;
+  while(next != NULL) {
+    if (next->listener == listener) {
+      entry->next = next->next;
+      delete next;
+      break;
+    }
+    entry = next;
+    next = next->next;
+  }
+}
+