X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=85b89d7bd71f9f907328c020aff3b5c22b16e86b;hb=546364c9567ef212ea9276201facf73f5ada696a;hp=f813f2a12c84221431b382a01ebc11ac874d7d07;hpb=a5123e6e7071da6d73a1ef0b19bf4acb19981605;p=supertux.git

diff --git a/src/collision.h b/src/collision.h
index f813f2a12..85b89d7bd 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -21,17 +21,20 @@
 #ifndef SUPERTUX_COLLISION_H
 #define SUPERTUX_COLLISION_H
 
-#include "type.h"
+#include "special/base.h"
+
+using namespace SuperTux;
 
 class Tile;
-class World;
 
 /* Collision objects */
 enum
 {
   CO_BULLET,
   CO_BADGUY,
-  CO_PLAYER
+  CO_PLAYER,
+  CO_TRAMPOLINE,
+  CO_FLYING_PLATFORM
 };
 
 enum CollisionType {
@@ -53,6 +56,7 @@ Tile* gettile(float x, float y);
 bool  issolid(float x, float y);
 bool  isbrick(float x, float y);
 bool  isice(float x, float y);
+bool  isspike(float x, float y);
 bool  isfullbox(float x, float y);
 
 typedef void* (*tiletestfunction)(Tile* tile);