Make tux and yeti dying state not reveal secret tilemaps

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

diff --git a/src/object/icecrusher.cpp b/src/object/icecrusher.cpp
index 55129ce..72220a4 100644 (file)
--- a/src/object/icecrusher.cpp
+++ b/src/object/icecrusher.cpp
@@ -149,11 +149,11 @@ IceCrusher::collision_solid(const CollisionHit& hit)
           {
           Sector::current()->add_object(std::make_shared<Particles>(
                                           Vector(get_bbox().p2.x - j*8 - 4, get_bbox().p2.y),
-                                          0, 90-5*j, Vector(140, -380), Vector(0, 300),
+                                          0, 90-5*j, 140, 380, Vector(0, 300),
                                           1, Color(.6f, .6f, .6f), 5, 1.8f, LAYER_OBJECTS+1));
           Sector::current()->add_object(std::make_shared<Particles>(
                                           Vector(get_bbox().p1.x + j*8 + 4, get_bbox().p2.y),
-                                          270+5*j, 360, Vector(140, -380), Vector(0, 300),
+                                          270+5*j, 360, 140, 380, Vector(0, 300),
                                           1, Color(.6f, .6f, .6f), 5, 1.8f, LAYER_OBJECTS+1));
           }
         }
@@ -166,11 +166,11 @@ IceCrusher::collision_solid(const CollisionHit& hit)
           {
           Sector::current()->add_object(std::make_shared<Particles>(
                                           Vector(get_bbox().p2.x - j*8 - 4, get_bbox().p2.y),
-                                          0, 90+10*j, Vector(140, -260), Vector(0, 300),
+                                          0, 90+10*j, 140, 260, Vector(0, 300),
                                           1, Color(.6f, .6f, .6f), 4, 1.6f, LAYER_OBJECTS+1));
           Sector::current()->add_object(std::make_shared<Particles>(
                                           Vector(get_bbox().p1.x + j*8 + 4, get_bbox().p2.y),
-                                          270+10*j, 360, Vector(140, -260), Vector(0, 300),
+                                          270+10*j, 360, 140, 260, Vector(0, 300),
                                           1, Color(.6f, .6f, .6f), 4, 1.6f, LAYER_OBJECTS+1));
           }
         }
@@ -238,14 +238,14 @@ IceCrusher::draw(DrawingContext& context)
 {
   context.push_target();
   context.set_target(DrawingContext::NORMAL);
-  sprite->draw(context, get_pos(), layer);
+  sprite->draw(context, get_pos(), layer+2);
   if(!(state == CRUSHING) && sprite->has_action("whites"))
   {
     // draw icecrusher's eyes slightly behind
-    lefteye->draw(context, get_pos()+eye_position(false), layer-1);
-    righteye->draw(context, get_pos()+eye_position(true), layer-1);
+    lefteye->draw(context, get_pos()+eye_position(false), layer+1);
+    righteye->draw(context, get_pos()+eye_position(true), layer+1);
     // draw the whites of icecrusher's eyes even further behind
-    whites->draw(context, get_pos(), layer-2);
+    whites->draw(context, get_pos(), layer);
   }
   context.pop_target();
 }