X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Ftrigger_base.cpp;h=608b784a33c27429fd66d2e80ec038a0bcdb3a6c;hb=8cecc7815e5ab5fe2b646dbe6aaa8e95cf08e71f;hp=c99444869c0edd066cbe29e8c350d40203a86f29;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index c99444869..608b784a3 100644
--- 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) {