Limitated the number of bullets to be shot at the same time.

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index fa165d7..3f6db25 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -1,13 +1,22 @@
-// C Interface: collision
-//
-// Description: 
-//
-//
-// Author: Tobias Glaesser <tobi.web@web.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
 
 #ifndef SUPERTUX_COLLISION_H
 #define SUPERTUX_COLLISION_H
@@ -15,6 +24,7 @@
 #include "type.h"
 
 class Tile;
+class World;
 
 /* Collision objects */
 enum
@@ -32,13 +42,10 @@ enum CollisionType {
 
 bool rectcollision(base_type* one, base_type* two);
 bool rectcollision_offset(base_type* one, base_type* two, float off_x, float off_y);
+
 void collision_swept_object_map(base_type* old, base_type* current);
 bool collision_object_map(base_type* object);
 
-/* Checks for all possible collisions.
-   And calls the collision_handlers, which the collision_objects provide for this case (or not). */
-void collision_handler();
-
 /** Return a pointer to the tile at the given x/y coordinates */
 Tile* gettile(float x, float y);