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

[supertux.git] / src / collision.cpp

diff --git a/src/collision.cpp b/src/collision.cpp
index afb4a92..15a8b8b 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -1,19 +1,30 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
-// C Implementation: collision
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  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.
 
 #include "defines.h"
 #include "collision.h"
 #include "bitmask.h"
 #include "scene.h"
+#include "world.h"
+#include "level.h"
+#include "tile.h"
 
 bool rectcollision(base_type* one, base_type* two)
 {
@@ -37,9 +48,9 @@ bool collision_object_map(base_type* pbase)
   int h = (int)pbase->width / 16;
 
   if(issolid(pbase->x + 1, pbase->y + 1) ||
-      issolid(pbase->x + pbase->width -1, pbase->y + 1) ||
-      issolid(pbase->x +1, pbase->y + pbase->height -1) ||
-      issolid(pbase->x + pbase->width -1, pbase->y + pbase->height - 1))
+     issolid(pbase->x + pbase->width -1, pbase->y + 1) ||
+     issolid(pbase->x +1, pbase->y + pbase->height -1) ||
+     issolid(pbase->x + pbase->width -1, pbase->y + pbase->height - 1))
     return true;
 
   for(int i = 1; i < h; ++i)
@@ -201,78 +212,42 @@ void collision_swept_object_map(base_type* old, base_type* current)
   *old = *current;
 }
 
-void collision_handler()
+
+Tile* gettile(float x, float y)
 {
-  // CO_BULLET & CO_BADGUY check
-  for(unsigned int i = 0; i < bullets.size(); ++i)
-    {
-      for(unsigned int j = 0; j < bad_guys.size(); ++j)
-        {
-          if(bad_guys[j].dying == DYING_NOT)
-            {
-              if(rectcollision(&bullets[i].base,&bad_guys[j].base))
-                {
-                  // We have detected a collision and now call the
-                  // collision functions of the collided objects.
-                  bullet_collision(&bullets[i], CO_BADGUY);
-                  bad_guys[j].collision(&bullets[i], CO_BULLET);
-                }
-            }
-        }
-    }
+  return TileManager::instance()->get(World::current()->get_level()->gettileid(x, y));
+}
 
-  /* CO_BADGUY & CO_BADGUY check */
-  for(unsigned int i = 0; i < bad_guys.size(); ++i)
-    {
-      if(bad_guys[i].dying == DYING_NOT)
-        {
-          for(unsigned int j = i+1; j < bad_guys.size(); ++j)
-            {
-              if(j != i && !bad_guys[j].dying)
-                {
-                  if(rectcollision(&bad_guys[i].base, &bad_guys[j].base))
-                    {
-                      // We have detected a collision and now call the
-                      // collision functions of the collided objects.
-                      bad_guys[j].collision(&bad_guys[i], CO_BADGUY);
-                      bad_guys[i].collision(&bad_guys[j], CO_BADGUY);
-                    }
-                }
-            }
-        }
-    }
+bool issolid(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->solid;
+}
 
-  // CO_BADGUY & CO_PLAYER check 
-  for(unsigned int i = 0; i < bad_guys.size(); ++i)
-    {
-      if(bad_guys[i].dying == DYING_NOT && rectcollision_offset(&bad_guys[i].base,&tux.base,0,0))
-        {
-          // We have detected a collision and now call the collision
-          // functions of the collided objects.
-          if (tux.previous_base.y < tux.base.y &&
-              tux.previous_base.y + tux.previous_base.height < bad_guys[i].base.y + bad_guys[i].base.height/2 &&
-              bad_guys[i].kind != BAD_MONEY && bad_guys[i].mode != HELD)
-            {
-              bad_guys[i].collision(&tux, CO_PLAYER);
-            }
-          else
-            {
-              tux.collision(&bad_guys[i], CO_BADGUY);
-            }
-        }
-    }
+bool isbrick(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->brick;
+}
 
-  // CO_UPGRADE & CO_PLAYER check
-  for(unsigned int i = 0; i < upgrades.size(); ++i)
-    {
-      if(rectcollision(&upgrades[i].base,&tux.base))
-        {
-          // We have detected a collision and now call the collision
-          // functions of the collided objects.
-          upgrade_collision(&upgrades[i], &tux, CO_PLAYER);
-        }
-    }
+bool isice(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->ice;
+}
 
+bool isfullbox(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->fullbox;
 }
 
+bool isdistro(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->distro;
+}
+
+/* EOF */
+