Ooops, forgot to upload the actual Statistics implementation.

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 86bb7d2..d055a1e 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -116,13 +116,13 @@ TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer,
                   Uint32 drawing_effect)
 {
   if(head != NULL)
-    head->draw(context, pos, layer, drawing_effect);
+    head->draw(context, pos, layer-1, drawing_effect);
   if(body != NULL)
-    body->draw(context, pos, layer, drawing_effect);
+    body->draw(context, pos, layer-3, drawing_effect);
   if(arms != NULL)
-    arms->draw(context, pos, layer, drawing_effect);
+    arms->draw(context, pos, layer,   drawing_effect);
   if(feet != NULL)
-    feet->draw(context, pos, layer, drawing_effect);
+    feet->draw(context, pos, layer-2, drawing_effect);
 }
 
 Player::Player()
@@ -747,7 +747,7 @@ Player::draw(DrawingContext& context)
   Vector pos = Vector(base.x, base.y);
 
   /* Set Tux sprite action */
-  if (duck && size != SMALL)
+  if (duck && size == BIG)
     {
     if(dir == LEFT)
       tux_body->set_action("duck-left");
@@ -807,7 +807,7 @@ Player::draw(DrawingContext& context)
       if(dir == LEFT)
         tux_body->head->set_action("idle-left");
       else // dir == RIGHT
-        tux_body->set_action("idle-right");
+        tux_body->head->set_action("idle-right");
 
       tux_body->head->start_animation(1);
       }
@@ -822,16 +822,16 @@ Player::draw(DrawingContext& context)
     if (duck)
       {
       if(dir == LEFT)
-        tux_body->arms->set_action("duck+grab");
+        tux_body->arms->set_action("duck+grab-left");
       else // dir == RIGHT
-        tux_body->set_action("duck-right");
+        tux_body->arms->set_action("duck+grab-right");
       }
     else
       {
       if(dir == LEFT)
-        tux_body->arms->set_action("grab");
+        tux_body->arms->set_action("grab-left");
       else // dir == RIGHT
-        tux_body->set_action("duck-right");
+        tux_body->arms->set_action("grab-right");
       }
     }
 
@@ -870,7 +870,8 @@ Player::draw(DrawingContext& context)
 
   // Draw blinking star overlay
   if (invincible_timer.started() &&
-     (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
+     (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3)
+     && !dying)
   {
     if (size == SMALL || duck)
       smalltux_star->draw(context, pos, LAYER_OBJECTS + 2);