projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed game crashing when leaving the worldmap
[supertux.git]
/
src
/
sector.cpp
diff --git
a/src/sector.cpp
b/src/sector.cpp
index
5ced57b
..
fdae3ff
100644
(file)
--- a/
src/sector.cpp
+++ b/
src/sector.cpp
@@
-68,6
+68,7
@@
#include "script_interface.hpp"
#include "log.hpp"
#include "main.hpp"
#include "script_interface.hpp"
#include "log.hpp"
#include "main.hpp"
+#include "level.hpp"
Sector* Sector::_current = 0;
Sector* Sector::_current = 0;
@@
-313,14
+314,15
@@
Sector::parse_old_format(const lisp::Lisp& reader)
std::vector<unsigned int> tiles;
if(reader.get_vector("interactive-tm", tiles)
|| reader.get_vector("tilemap", tiles)) {
std::vector<unsigned int> tiles;
if(reader.get_vector("interactive-tm", tiles)
|| reader.get_vector("tilemap", tiles)) {
- TileMap* tilemap = new TileMap();
+ TileMap* tilemap = new TileMap(
level->get_tileset()
);
tilemap->set(width, height, tiles, LAYER_TILES, true);
// replace tile id 112 (old invisible tile) with 1311 (new invisible tile)
for(size_t x=0; x < tilemap->get_width(); ++x) {
for(size_t y=0; y < tilemap->get_height(); ++y) {
tilemap->set(width, height, tiles, LAYER_TILES, true);
// replace tile id 112 (old invisible tile) with 1311 (new invisible tile)
for(size_t x=0; x < tilemap->get_width(); ++x) {
for(size_t y=0; y < tilemap->get_height(); ++y) {
- const Tile* tile = tilemap->get_tile(x, y);
- if(tile->getID() == 112) tilemap->change(x, y, 1311);
+ uint32_t id = tilemap->get_tile_id(x, y);
+ if(id == 112)
+ tilemap->change(x, y, 1311);
}
}
}
}
@@
-329,14
+331,14
@@
Sector::parse_old_format(const lisp::Lisp& reader)
}
if(reader.get_vector("background-tm", tiles)) {
}
if(reader.get_vector("background-tm", tiles)) {
- TileMap* tilemap = new TileMap();
+ TileMap* tilemap = new TileMap(
level->get_tileset()
);
tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false);
if (height < 19) tilemap->resize(width, 19);
add_object(tilemap);
}
if(reader.get_vector("foreground-tm", tiles)) {
tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false);
if (height < 19) tilemap->resize(width, 19);
add_object(tilemap);
}
if(reader.get_vector("foreground-tm", tiles)) {
- TileMap* tilemap = new TileMap();
+ TileMap* tilemap = new TileMap(
level->get_tileset()
);
tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
// fill additional space in foreground with tiles of ID 2035 (lightmap/black)
tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
// fill additional space in foreground with tiles of ID 2035 (lightmap/black)
@@
-398,10
+400,11
@@
Sector::fix_old_tiles()
TileMap* solids = *i;
for(size_t x=0; x < solids->get_width(); ++x) {
for(size_t y=0; y < solids->get_height(); ++y) {
TileMap* solids = *i;
for(size_t x=0; x < solids->get_width(); ++x) {
for(size_t y=0; y < solids->get_height(); ++y) {
- const Tile* tile = solids->get_tile(x, y);
+ uint32_t id = solids->get_tile_id(x, y);
+ const Tile *tile = solids->get_tile(x, y);
Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32);
Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32);
- if(
tile->getID()
== 112) {
+ if(
id
== 112) {
add_object(new InvisibleBlock(pos));
solids->change(x, y, 0);
} else if(tile->getAttributes() & Tile::COIN) {
add_object(new InvisibleBlock(pos));
solids->change(x, y, 0);
} else if(tile->getAttributes() & Tile::COIN) {
@@
-428,20
+431,20
@@
Sector::fix_old_tiles()
if (!tm) continue;
for(size_t x=0; x < tm->get_width(); ++x) {
for(size_t y=0; y < tm->get_height(); ++y) {
if (!tm) continue;
for(size_t x=0; x < tm->get_width(); ++x) {
for(size_t y=0; y < tm->get_height(); ++y) {
-
const Tile* tile = tm->get_tile
(x, y);
+
uint32_t id = tm->get_tile_id
(x, y);
Vector pos(tm->get_x_offset() + x*32, tm->get_y_offset() + y*32);
Vector center(pos.x + 16, pos.y + 16);
// torch
Vector pos(tm->get_x_offset() + x*32, tm->get_y_offset() + y*32);
Vector center(pos.x + 16, pos.y + 16);
// torch
- if (
tile->getID()
== 1517) {
+ if (
id
== 1517) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.9f, 1.0f, Color(1.0f, 1.0f, 0.6f, 1.0f)));
}
// lava or lavaflow
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.9f, 1.0f, Color(1.0f, 1.0f, 0.6f, 1.0f)));
}
// lava or lavaflow
- if ((
tile->getID() == 173) || (tile->getID() == 1700) || (tile->getID() == 1705) || (tile->getID()
== 1706)) {
+ if ((
id == 173) || (id == 1700) || (id == 1705) || (id
== 1706)) {
// space lights a bit
// space lights a bit
- if (((
tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID(
))
- && (tm->get_tile
(x, y-1)->getID() != tm->get_tile(x,y)->getID(
)))
+ if (((
(tm->get_tile_id(x-1, y)) != tm->get_tile_id(x,y
))
+ && (tm->get_tile
_id(x, y-1) != tm->get_tile_id(x,y
)))
|| ((x % 3 == 0) && (y % 3 == 0))) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));
|| ((x % 3 == 0) && (y % 3 == 0))) {
float pseudo_rnd = (float)((int)pos.x % 10) / 10;
add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));
@@
-884,16
+887,23
@@
static const float SHIFT_DELTA = 7.0f;
/** r1 is supposed to be moving, r2 a solid object */
void check_collisions(collision::Constraints* constraints,
const Vector& movement, const Rect& r1, const Rect& r2,
/** r1 is supposed to be moving, r2 a solid object */
void check_collisions(collision::Constraints* constraints,
const Vector& movement, const Rect& r1, const Rect& r2,
- GameObject* object = NULL, MovingObject* other = NULL)
+ GameObject* object = NULL, MovingObject* other = NULL
, const Vector& addl_ground_movement = Vector(0,0)
)
{
if(!collision::intersects(r1, r2))
return;
{
if(!collision::intersects(r1, r2))
return;
+ MovingObject *moving_object = dynamic_cast<MovingObject*> (object);
+ CollisionHit dummy;
+ if(other != NULL && !other->collides(*object, dummy))
+ return;
+ if(moving_object != NULL && !moving_object->collides(*other, dummy))
+ return;
+
// calculate intersection
// calculate intersection
- float itop = r1.get_bottom() - r2.get_top();
+ float itop
= r1.get_bottom() - r2.get_top();
float ibottom = r2.get_bottom() - r1.get_top();
float ibottom = r2.get_bottom() - r1.get_top();
- float ileft = r1.get_right() - r2.get_left();
- float iright = r2.get_right() - r1.get_left();
+ float ileft
= r1.get_right() - r2.get_left();
+ float iright
= r2.get_right() - r1.get_left();
if(fabsf(movement.y) > fabsf(movement.x)) {
if(ileft < SHIFT_DELTA) {
if(fabsf(movement.y) > fabsf(movement.x)) {
if(ileft < SHIFT_DELTA) {
@@
-914,14
+924,15
@@
void check_collisions(collision::Constraints* constraints,
}
}
}
}
+ constraints->ground_movement += addl_ground_movement;
if(other != NULL) {
if(other != NULL) {
- CollisionHit dummy;
HitResponse response = other->collision(*object, dummy);
if(response == PASSTHROUGH)
return;
HitResponse response = other->collision(*object, dummy);
if(response == PASSTHROUGH)
return;
+
if(other->get_movement() != Vector(0, 0)) {
// TODO what todo when we collide with 2 moving objects?!?
if(other->get_movement() != Vector(0, 0)) {
// TODO what todo when we collide with 2 moving objects?!?
- constraints->ground_movement = other->get_movement();
+ constraints->ground_movement
+
= other->get_movement();
}
}
}
}
@@
-988,10
+999,10
@@
Sector::collision_tilemap(collision::Constraints* constraints,
Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
triangle = AATriangle(p1, p2, tile->getData());
Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
triangle = AATriangle(p1, p2, tile->getData());
- collision::rectangle_aatriangle(constraints, dest, triangle);
+ collision::rectangle_aatriangle(constraints, dest, triangle
, solids->get_movement()
);
} else { // normal rectangular tile
Rect rect(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset(), (x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
} else { // normal rectangular tile
Rect rect(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset(), (x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
- check_collisions(constraints, movement, dest, rect);
+ check_collisions(constraints, movement, dest, rect
, NULL, NULL, solids->get_movement()
);
}
}
}
}
}
}
@@
-1072,12
+1083,19
@@
Sector::collision_object(MovingObject* object1, MovingObject* object2) const
Vector normal;
get_hit_normal(r1, r2, hit, normal);
Vector normal;
get_hit_normal(r1, r2, hit, normal);
+ if(!object1->collides(*object2, hit))
+ return;
+ std::swap(hit.left, hit.right);
+ std::swap(hit.top, hit.bottom);
+ if(!object2->collides(*object1, hit))
+ return;
+ std::swap(hit.left, hit.right);
+ std::swap(hit.top, hit.bottom);
+
HitResponse response1 = object1->collision(*object2, hit);
std::swap(hit.left, hit.right);
std::swap(hit.top, hit.bottom);
HitResponse response2 = object2->collision(*object1, hit);
HitResponse response1 = object1->collision(*object2, hit);
std::swap(hit.left, hit.right);
std::swap(hit.top, hit.bottom);
HitResponse response2 = object2->collision(*object1, hit);
- assert( response1 != SOLID && response1 != PASSTHROUGH );
- assert( response2 != SOLID && response2 != PASSTHROUGH );
if(response1 == CONTINUE && response2 == CONTINUE) {
normal *= (0.5 + DELTA);
object1->dest.move(-normal);
if(response1 == CONTINUE && response2 == CONTINUE) {
normal *= (0.5 + DELTA);
object1->dest.move(-normal);
@@
-1168,8
+1186,10
@@
Sector::collision_static_constrains(MovingObject& object)
if(constraints.right < infinity) {
float width = constraints.right - constraints.left;
if(width + SHIFT_DELTA < owidth) {
if(constraints.right < infinity) {
float width = constraints.right - constraints.left;
if(width + SHIFT_DELTA < owidth) {
+#if 0
printf("Object %p crushed horizontally... L:%f R:%f\n", &object,
constraints.left, constraints.right);
printf("Object %p crushed horizontally... L:%f R:%f\n", &object,
constraints.left, constraints.right);
+#endif
CollisionHit h;
h.left = true;
h.right = true;
CollisionHit h;
h.left = true;
h.right = true;
@@
-1198,7
+1218,9
@@
Sector::collision_static_constrains(MovingObject& object)
if(constraints.bottom < infinity) {
float height = constraints.bottom - constraints.top;
if(height + SHIFT_DELTA < oheight) {
if(constraints.bottom < infinity) {
float height = constraints.bottom - constraints.top;
if(height + SHIFT_DELTA < oheight) {
+#if 0
printf("Object %p crushed vertically...\n", &object);
printf("Object %p crushed vertically...\n", &object);
+#endif
CollisionHit h;
h.top = true;
h.bottom = true;
CollisionHit h;
h.top = true;
h.bottom = true;
@@
-1284,6
+1306,11
@@
Sector::handle_collisions()
CollisionHit hit;
get_hit_normal(moving_object->dest, moving_object_2->dest,
hit, normal);
CollisionHit hit;
get_hit_normal(moving_object->dest, moving_object_2->dest,
hit, normal);
+ if(!moving_object->collides(*moving_object_2, hit))
+ continue;
+ if(!moving_object_2->collides(*moving_object, hit))
+ continue;
+
moving_object->collision(*moving_object_2, hit);
moving_object_2->collision(*moving_object, hit);
}
moving_object->collision(*moving_object_2, hit);
moving_object_2->collision(*moving_object, hit);
}
@@
-1472,7
+1499,9
@@
Sector::inside(const Rect& rect) const
TileMap* solids = *i;
bool horizontally = ((rect.p2.x >= 0 + solids->get_x_offset()) && (rect.p1.x <= solids->get_width() * 32 + solids->get_x_offset()));
bool vertically = (rect.p1.y <= solids->get_height() * 32 + solids->get_y_offset());
TileMap* solids = *i;
bool horizontally = ((rect.p2.x >= 0 + solids->get_x_offset()) && (rect.p1.x <= solids->get_width() * 32 + solids->get_x_offset()));
bool vertically = (rect.p1.y <= solids->get_height() * 32 + solids->get_y_offset());
- if (horizontally && vertically) return true;
+
+ if (horizontally && vertically)
+ return true;
}
return false;
}
}
return false;
}
@@
-1481,10
+1510,14
@@
float
Sector::get_width() const
{
float width = 0;
Sector::get_width() const
{
float width = 0;
- for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin();
+ i != solid_tilemaps.end(); i++) {
TileMap* solids = *i;
TileMap* solids = *i;
- if ((solids->get_width() * 32 + solids->get_x_offset()) > width) width = (solids->get_width() * 32 + solids->get_x_offset());
+ if ((solids->get_width() * 32 + solids->get_x_offset()) > width) {
+ width = solids->get_width() * 32 + solids->get_x_offset();
+ }
}
}
+
return width;
}
return width;
}
@@
-1492,10
+1525,14
@@
float
Sector::get_height() const
{
float height = 0;
Sector::get_height() const
{
float height = 0;
- for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin();
+ i != solid_tilemaps.end(); i++) {
TileMap* solids = *i;
TileMap* solids = *i;
- if ((solids->get_height() * 32 + solids->get_y_offset()) > height) height = (solids->get_height() * 32 + solids->get_y_offset());
+ if ((solids->get_height() * 32 + solids->get_y_offset()) > height) {
+ height = solids->get_height() * 32 + solids->get_y_offset();
+ }
}
}
+
return height;
}
return height;
}