converted player to new object system

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index f813f2a..225a771 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -31,7 +31,8 @@ enum
 {
   CO_BULLET,
   CO_BADGUY,
-  CO_PLAYER
+  CO_PLAYER,
+  CO_TRAMPOLINE
 };
 
 enum CollisionType {
@@ -53,6 +54,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);