fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / trigger / trigger_base.cpp

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index c994448..480cd90 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.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,15 +16,17 @@
 //  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>
 
-#include "trigger_base.h"
-#include "player.h"
-#include "video/drawing_context.h"
+#include "trigger_base.hpp"
+#include "video/drawing_context.hpp"
+#include "object/player.hpp"
 
 TriggerBase::TriggerBase()
   : sprite(0)
 {
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 TriggerBase::~TriggerBase()
@@ -32,7 +34,7 @@ TriggerBase::~TriggerBase()
 }
 
 void
-TriggerBase::action(float )
+TriggerBase::update(float )
 {
   lasthit = hit;
   hit = false;
@@ -48,7 +50,7 @@ TriggerBase::draw(DrawingContext& context)
 }
 
 HitResponse
-TriggerBase::collision(GameObject& other, const CollisionHit& collhit)
+TriggerBase::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
@@ -59,4 +61,3 @@ TriggerBase::collision(GameObject& other, const CollisionHit& collhit)
 
   return ABORT_MOVE;
 }
-