X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.cpp;h=2c1ffb31f7955002f3cd92d170fcc01b07c64cf8;hb=8f2d3b4b577297359c0cb57acb7e0782a3c35ea5;hp=1942f633779e3a1dce8cadd26d890ccd1e4b09e2;hpb=058e2f6298d8319c0fe03c5e950a36a8f1f57aba;p=supertux.git

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index 1942f6337..2c1ffb31f 100644
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,19 +12,18 @@
 //  GNU General Public License for more details.
 //
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "trigger_base.hpp"
+#include "trigger/trigger_base.hpp"
 
-#include "sprite/sprite.hpp"
-#include "video/drawing_request.hpp"
 #include "object/player.hpp"
+#include "sprite/sprite.hpp"
 
-TriggerBase::TriggerBase()
-  : sprite(0), lasthit(false), hit(false)
+TriggerBase::TriggerBase() :
+  sprite(),
+  lasthit(false),
+  hit(false),
+  losetouch_listeners()
 {
   set_group(COLGROUP_TOUCHABLE);
 }
@@ -34,7 +31,7 @@ TriggerBase::TriggerBase()
 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++) {
+  for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); ++i) {
     Player* p = *i;
     p->del_remove_listener(this);
   }
@@ -45,7 +42,7 @@ void
 TriggerBase::update(float )
 {
   if (lasthit && !hit) {
-    for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); i++) {
+    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);
@@ -59,7 +56,7 @@ TriggerBase::update(float )
 void
 TriggerBase::draw(DrawingContext& context)
 {
-  if(!sprite)
+  if(!sprite.get())
     return;
 
   sprite->draw(context, get_pos(), LAYER_TILES+1);
@@ -80,11 +77,11 @@ TriggerBase::collision(GameObject& other, const CollisionHit& )
 
   return ABORT_MOVE;
 }
-  
-void 
+
+void
 TriggerBase::object_removed(GameObject* object)
 {
-  for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); i++) {
+  for (std::list<Player*>::iterator i = losetouch_listeners.begin(); i != losetouch_listeners.end(); ++i) {
     Player* p = *i;
     if (p == object) {
       losetouch_listeners.erase(i);
@@ -93,3 +90,4 @@ TriggerBase::object_removed(GameObject* object)
   }
 }
 
+/* EOF */