-Started to move stuff from library back to main game

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

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index c994448..608b784 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -19,8 +19,8 @@
 #include <config.h>
 
 #include "trigger_base.h"
-#include "player.h"
 #include "video/drawing_context.h"
+#include "object/player.h"
 
 TriggerBase::TriggerBase()
   : sprite(0)
@@ -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) {