// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
+#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"
+struct TileInfo
+{
+ Tile *tile;
+ int x, y;
+} tileinfo;
+
bool rectcollision(const base_type& one, const base_type& two)
{
return (one.x >= two.x - one.width + 1 &&
bool collision_object_map(const base_type& base)
{
- if(!World::current())
- return false;
-
- 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;
int max_x = int(base.x + base.width);
int max_y = int(base.y + base.height);
+ tileinfo.tile = NULL;
+
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 && tile->solid)
+ Tile* tile = tilemap.get_tile(x, y);
+ if(tile && tile->attributes & Tile::SOLID)
+ {
+ tileinfo.tile = tile;
+ tileinfo.x = x*32;
+ tileinfo.y = y*32;
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));
+ Tile* tile = tilemap.get_tile(x, y);
void* result = function(tile);
if(result != 0)
return result;
static void* test_goal_tile_function(Tile* tile)
{
- if(tile && tile->goal)
+ if(tile && (tile->attributes & Tile::GOAL))
return tile;
return 0;
}
if(collision_object_map(*old))
{
+ if(tileinfo.tile->slope_angle != 0)
+ { // in case this is a slope, set the right Y position
+ // left-right slope:
+ if(tileinfo.tile->slope_angle > 0 && tileinfo.tile->slope_angle < M_PI/2)
+ current->y = tileinfo.y - current->height +
+ (tileinfo.x - current->x)*tan(M_PI/2 - tileinfo.tile->slope_angle)
+ - 1;
+ // right-left slope:
+ if(tileinfo.tile->slope_angle > M_PI/2 && tileinfo.tile->slope_angle < M_PI)
+ current->y = tileinfo.y - current->height +
+ (current->x - tileinfo.x)*tan(M_PI - tileinfo.tile->slope_angle)
+ - 1;
+ }
+ else
+ {
switch(h)
{
case 1:
}
break;
}
+ }
}
if((xd > 0 && current->x < orig_x) || (xd < 0 && current->x > orig_x))
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;
+ return tile && (tile->attributes & Tile::SOLID);
}
-bool isunisolid(float x, float y)
-{
- Tile* tile = gettile(x,y);
- return tile && tile->unisolid;
-}
-
-
bool isbrick(float x, float y)
{
Tile* tile = gettile(x,y);
- return tile && tile->brick;
+ return tile && (tile->attributes & Tile::BRICK);
}
bool isice(float x, float y)
{
Tile* tile = gettile(x,y);
- return tile && tile->ice;
+ return tile && (tile->attributes & Tile::ICE);
}
bool isspike(float x, float y)
{
Tile* tile = gettile(x,y);
- return tile && tile->spike;
+ return tile && (tile->attributes & Tile::SPIKE);
}
bool isfullbox(float x, float y)
{
Tile* tile = gettile(x,y);
- return tile && tile->fullbox;
+ return tile && (tile->attributes & Tile::FULLBOX);
}
-bool isdistro(float x, float y)
+bool iscoin(float x, float y)
{
Tile* tile = gettile(x,y);
- return tile && tile->distro;
+ return tile && (tile->attributes & Tile::COIN);
}
/* EOF */