X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=85b89d7bd71f9f907328c020aff3b5c22b16e86b;hb=6c61f312a1f5a768e202195ca18ed5a51974bdcc;hp=225a771ffa63d6110b3115cdfff815f84c41f4b0;hpb=c11b04d0525c1566260b02bacd78fd7faa7be8f1;p=supertux.git diff --git a/src/collision.h b/src/collision.h index 225a771ff..85b89d7bd 100644 --- 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 {