renamed all .h to .hpp

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

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index c994448..411150a 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -18,9 +18,9 @@
 //  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)
@@ -32,7 +32,7 @@ TriggerBase::~TriggerBase()
 }
 
 void
-TriggerBase::action(float )
+TriggerBase::update(float )
 {
   lasthit = hit;
   hit = false;
@@ -48,7 +48,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) {