// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
+#include <config.h>
+
+#include <cmath>
#include "defines.h"
#include "collision.h"
-#include "bitmask.h"
#include "scene.h"
-#include "world.h"
-#include "level.h"
+#include "sector.h"
+#include "tilemap.h"
#include "tile.h"
+#if 0
bool rectcollision(const base_type& one, const base_type& two)
{
return (one.x >= two.x - one.width + 1 &&
one.y <= two.y + two.height + off_y - 1);
}
+bool collision_object_map(const Rectangle& rect)
+{
+ base_type base;
+ base.x = rect.p1.x;
+ base.y = rect.p1.y;
+ base.width = rect.get_width();
+ base.height = rect.get_height();
+ return collision_object_map(base);
+}
+
bool collision_object_map(const base_type& base)
{
- const Level& level = *World::current()->get_level();
- TileManager& tilemanager = *TileManager::instance();
+ const TileMap& tilemap = *Sector::current()->solids;
// we make the collision rectangle 1 pixel smaller
int starttilex = int(base.x+1) / 32;
for(int x = starttilex; x*32 < max_x; ++x) {
for(int y = starttiley; y*32 < max_y; ++y) {
- Tile* tile = tilemanager.get(level.get_tile_at(x, y));
- if(tile->solid)
+ const Tile* tile = tilemap.get_tile(x, y);
+ if(tile && tile->attributes & Tile::SOLID)
return true;
}
}
void* collision_func(const base_type& base, tiletestfunction function)
{
- const Level& level = *World::current()->get_level();
- TileManager& tilemanager = *TileManager::instance();
+ const TileMap& tilemap = *Sector::current()->solids;
int starttilex = int(base.x) / 32;
int starttiley = int(base.y) / 32;
for(int x = starttilex; x*32 < max_x; ++x) {
for(int y = starttiley; y*32 < max_y; ++y) {
- Tile* tile = tilemanager.get(level.get_tile_at(x, y));
+ const Tile* tile = tilemap.get_tile(x, y);
void* result = function(tile);
if(result != 0)
return result;
return 0;
}
-static void* test_goal_tile_function(Tile* tile)
+static void* test_goal_tile_function(const Tile* tile)
{
- if(tile && tile->goal)
- return tile;
+ if(tile && (tile->attributes & Tile::GOAL))
+ return const_cast<void*> ((const void*) tile); // evil cast...
return 0;
}
-Tile* collision_goal(const base_type& base)
+const Tile* collision_goal(const Rectangle& rect)
{
- return (Tile*) collision_func(base, test_goal_tile_function);
+ // too lazy to rewrite for now, so we transform to base_type...
+ base_type base;
+ base.x = rect.p1.x;
+ base.y = rect.p1.y;
+ base.width = rect.get_width();
+ base.height = rect.get_height();
+ return (const Tile*) collision_func(base, test_goal_tile_function);
}
void collision_swept_object_map(base_type* old, base_type* current)
*old = *current;
}
-Tile* gettile(float x, float y)
+const Tile* gettile(float x, float y)
{
- return TileManager::instance()->get(World::current()->get_level()->gettileid(x, y));
+ const TileMap& tilemap = *Sector::current()->solids;
+ return tilemap.get_tile_at(Vector(x, y));
}
bool issolid(float x, float y)
{
- Tile* tile = gettile(x,y);
- return tile && tile->solid;
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::SOLID);
}
bool isbrick(float x, float y)
{
- Tile* tile = gettile(x,y);
- return tile && tile->brick;
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::BRICK);
}
bool isice(float x, float y)
{
- Tile* tile = gettile(x,y);
- return tile && tile->ice;
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::ICE);
}
-bool isfullbox(float x, float y)
+bool isspike(float x, float y)
{
- Tile* tile = gettile(x,y);
- return tile && tile->fullbox;
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::SPIKE);
}
-bool isdistro(float x, float y)
+bool isfullbox(float x, float y)
{
- Tile* tile = gettile(x,y);
- return tile && tile->distro;
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::FULLBOX);
}
-/* EOF */
+bool iscoin(float x, float y)
+{
+ const Tile* tile = gettile(x,y);
+ return tile && (tile->attributes & Tile::COIN);
+}
+#endif