- fixed warnings

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index b9e8410..85b89d7 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -21,10 +21,11 @@
 #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
@@ -32,7 +33,8 @@ enum
   CO_BULLET,
   CO_BADGUY,
   CO_PLAYER,
-  CO_TRAMPOLINE
+  CO_TRAMPOLINE,
+  CO_FLYING_PLATFORM
 };
 
 enum CollisionType {
@@ -54,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);