Brought back particles for bomb explosions

[supertux.git] / src / object / particlesystem_interactive.cpp

diff --git a/src/object/particlesystem_interactive.cpp b/src/object/particlesystem_interactive.cpp
index 9923c03..6cd527b 100644 (file)
--- a/src/object/particlesystem_interactive.cpp
+++ b/src/object/particlesystem_interactive.cpp
@@ -80,7 +80,7 @@ ParticleSystem_Interactive::collision(Particle* object, Vector movement)
   dest.move(movement);
   Constraints constraints;
 
-  for(std::list<TileMap*>::const_iterator i = Sector::current()->solid_tilemaps.begin(); i != Sector::current()->solid_tilemaps.end(); i++) {
+  for(std::list<TileMap*>::const_iterator i = Sector::current()->solid_tilemaps.begin(); i != Sector::current()->solid_tilemaps.end(); ++i) {
     TileMap* solids = *i;
     // FIXME Handle a nonzero tilemap offset
     for(int x = starttilex; x*32 < max_x; ++x) {
@@ -93,7 +93,7 @@ ParticleSystem_Interactive::collision(Particle* object, Vector movement)
           continue;
 
         Rectf rect = solids->get_tile_bbox(x, y);
-        if(tile->getAttributes() & Tile::SLOPE) { // slope tile
+        if(tile->is_slope ()) { // slope tile
           AATriangle triangle = AATriangle(rect, tile->getData());
 
           if(rectangle_aatriangle(&constraints, dest, triangle)) {