X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_object.cpp;h=ee63ec1c1547acc9820a54b1278111ee8da11eae;hb=99199c39ed744bf40e3fa60e26ba64c29c014ddc;hp=40d405662fa83aa5af0ee8d6cfc270636bbfa129;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/game_object.cpp b/src/game_object.cpp
index 40d405662..ee63ec1c1 100644
--- 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
@@ -19,11 +19,11 @@
 
 #include <config.h>
 
-#include "game_object.h"
-#include "object_remove_listener.h"
+#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,11 @@ 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;
   }
 }
+