X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision_hit.hpp;h=b9ed4d522c8562af00d07b16e83a049f13c9570b;hb=fdba1d4b1561c55309aee67d6e9a5b778cf21299;hp=e3ae28087cd7442190370a7b4e80f884c82587b0;hpb=bf769796df5b8899eadaff544409f0ee20882530;p=supertux.git

diff --git a/src/collision_hit.hpp b/src/collision_hit.hpp
index e3ae28087..b9ed4d522 100644
--- a/src/collision_hit.hpp
+++ b/src/collision_hit.hpp
@@ -1,7 +1,7 @@
-//  $Id: collision_hit.h 2177 2004-11-24 23:10:09Z matzebraun $
+//  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -33,7 +33,9 @@ enum HitResponse
   /// if this happens to often then the move will just be aborted    
   CONTINUE,
   /// do the move ignoring the collision
-  FORCE_MOVE
+  FORCE_MOVE,
+  /// passes movement to collided object
+  PASS_MOVEMENT
 };
 
 /**
@@ -50,12 +52,5 @@ public:
   Vector normal;
 };
 
-class TilemapCollisionHit : public CollisionHit
-{
-public:
-  /// the flags of all tiles tux collided with
-  int tileflags;
-};
-
 #endif