X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=fdae3ff23d4f0a2f5b2910cf210eeb1526d4c993;hb=0262a9c0ae29d375e8174038d8cc81ebbeb10215;hp=253212bc48ef045f763447aa588db7463e5a3ce9;hpb=0d4be1a5fadf30244c41188f114f83c818ece9bc;p=supertux.git

diff --git a/src/sector.cpp b/src/sector.cpp
index 253212bc4..fdae3ff23 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -443,8 +443,8 @@ Sector::fix_old_tiles()
 	// lava or lavaflow
 	if ((id == 173) || (id == 1700) || (id == 1705) || (id == 1706)) {
 	  // space lights a bit
-	  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))
+	  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)));
@@ -887,7 +887,7 @@ 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,
-                      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;
@@ -924,6 +924,7 @@ void check_collisions(collision::Constraints* constraints,
     }
   }
 
+  constraints->ground_movement += addl_ground_movement;
   if(other != NULL) {
     HitResponse response = other->collision(*object, dummy);
     if(response == PASSTHROUGH)
@@ -931,7 +932,7 @@ void check_collisions(collision::Constraints* constraints,
 
     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();
     }
   }
 
@@ -998,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());
 
-	  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());
-	  check_collisions(constraints, movement, dest, rect);
+	  check_collisions(constraints, movement, dest, rect, NULL, NULL, solids->get_movement());
 	}
       }
     }