X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision_hit.hpp;h=b9ed4d522c8562af00d07b16e83a049f13c9570b;hb=d753e2c21ae6af1fb8876529695dcc7f6a46e5f0;hp=42c0aa62ac027a23212d8cc9c0f471eca18a8140;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/collision_hit.hpp b/src/collision_hit.hpp
index 42c0aa62a..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
@@ -27,15 +27,15 @@
  */
 enum HitResponse
 {
-  // note: keep the elements in this order
-
   /// don't move the object
   ABORT_MOVE = 0,
   /// move object out of collision and check for collisions again
   /// 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
 };
 
 /**