X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=86bb7d2e0bf9cd2178549a82fa83957766be0520;hb=5023c5b34da1b979a9bd829824662960bd3a7ff9;hp=7f829722c3ba55597afb4a63252192909a790639;hpb=4d3df5a40dfea474da0f15d8f2c6c755738bb7f6;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 7f829722c..86bb7d2e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -88,29 +88,41 @@ void player_input_init(player_input_type* pplayer_input)
 void
 TuxBodyParts::set_action(std::string action)
 {
-head->set_action(action);
-body->set_action(action);
-arms->set_action(action);
-feet->set_action(action);
+  if(head != NULL)
+    head->set_action(action);
+  if(body != NULL)
+    body->set_action(action);
+  if(arms != NULL)
+    arms->set_action(action);
+  if(feet != NULL)
+    feet->set_action(action);
 }
 
 void
-TuxBodyParts::start_animation(int loops, std::string next_action)
+TuxBodyParts::one_time_animation()
 {
-head->start_animation(loops, next_action);
-body->start_animation(loops, next_action);
-arms->start_animation(loops, next_action);
-feet->start_animation(loops, next_action);
+  if(head != NULL)
+    head->start_animation(1);
+  if(body != NULL)
+    body->start_animation(1);
+  if(arms != NULL)
+    arms->start_animation(1);
+  if(feet != NULL)
+    feet->start_animation(1);
 }
 
 void
 TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer,
                   Uint32 drawing_effect)
 {
-head->draw(context, pos, layer, drawing_effect);
-body->draw(context, pos, layer, drawing_effect);
-arms->draw(context, pos, layer, drawing_effect);
-feet->draw(context, pos, layer, drawing_effect);
+  if(head != NULL)
+    head->draw(context, pos, layer, drawing_effect);
+  if(body != NULL)
+    body->draw(context, pos, layer, drawing_effect);
+  if(arms != NULL)
+    arms->draw(context, pos, layer, drawing_effect);
+  if(feet != NULL)
+    feet->draw(context, pos, layer, drawing_effect);
 }
 
 Player::Player()
@@ -734,124 +746,131 @@ Player::draw(DrawingContext& context)
   int layer = LAYER_OBJECTS - 1;
   Vector pos = Vector(base.x, base.y);
 
-  if ((!safe_timer.started() || growing_timer.started()) && (global_frame_counter % 2))
+  /* Set Tux sprite action */
+  if (duck && size != SMALL)
     {
-      if (dying == DYING_SQUISHED)
-        {
-          smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1);
-        }
-      else
-        {
-          if(growing_timer.check())
-            {
-              if(size == SMALL)
-                {
-                if (dir == RIGHT)
-                  context.draw_surface(growingtux_right[GROWING_FRAMES-1 - 
-                          ((growing_timer.get_gone() *
-                          GROWING_FRAMES) / GROWING_TIME)], pos, layer);
-                else
-                  context.draw_surface(growingtux_left[GROWING_FRAMES-1 - 
-                          ((growing_timer.get_gone() *
-                          GROWING_FRAMES) / GROWING_TIME)], pos, layer);
-                }
-              else
-                {
-                if (dir == RIGHT)
-                  context.draw_surface(growingtux_right[(growing_timer.get_gone() *
-                          GROWING_FRAMES) / GROWING_TIME], pos, layer);
-                else
-                  context.draw_surface(growingtux_left[(growing_timer.get_gone() *
-                                       GROWING_FRAMES) / GROWING_TIME], pos, layer);
-                }
-            }
-          else if (duck && size != SMALL)
-            {
-              if (dir == RIGHT)
-                tux_body->set_action("duck-right");
-              else 
-                tux_body->set_action("duck-left");
-            }
-
-          else if (skidding_timer.started())
-            {
-              if (dir == RIGHT)
-                tux_body->set_action("skid-right");
-              else
-                tux_body->set_action("skid-left");
-            }
-          else if (kick_timer.started())
-            {
-              if (dir == RIGHT)
-                tux_body->set_action("kick-right");
-              else
-                tux_body->set_action("kick-left");
-            }
-          else if (butt_jump)
-            {
-              if (dir == RIGHT)
-                tux_body->set_action("buttjump-right");
-              else
-                tux_body->set_action("buttjump-left");
-            }
-          else if (physic.get_velocity_y() != 0)
-            {
-              if (dir == RIGHT)
-                tux_body->set_action("jump-right");
-              else
-                tux_body->set_action("jump-left");
-            }
-          else
-            {
-              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
-                {
-                  if (dir == RIGHT)
-                    tux_body->set_action("stand-right");
-                  else
-                    tux_body->set_action("stand-left");
-                }
-              else // moving
-                {
-                  if (dir == RIGHT)
-                    tux_body->set_action("walk-right");
-                  else
-                    tux_body->set_action("walk-left");
-                }
-            }
-        }
+    if(dir == LEFT)
+      tux_body->set_action("duck-left");
+    else // dir == RIGHT
+      tux_body->set_action("duck-right");
     }
-/*
-  if(idle_timer.get_left() < 0)
+  else if (skidding_timer.started())
     {
-    if (dir == RIGHT)
+    if(dir == LEFT)
+      tux_body->set_action("skid-left");
+    else // dir == RIGHT
+      tux_body->set_action("skid-right");
+    }
+  else if (kick_timer.started())
+    {
+    if(dir == LEFT)
+      tux_body->set_action("kick-left");
+    else // dir == RIGHT
+      tux_body->set_action("kick-right");
+    }
+  else if (butt_jump)
+    {
+    if(dir == LEFT)
+      tux_body->set_action("buttjump-left");
+    else // dir == RIGHT
+      tux_body->set_action("buttjump-right");
+    }
+  else if (physic.get_velocity_y() != 0)
+    {
+    if(dir == LEFT)
+      tux_body->set_action("jump-left");
+    else // dir == RIGHT
+      tux_body->set_action("jump-right");
+    }
+  else
+    {
+    if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
       {
-      tux_body->set_action("idle-right");
-      tux_body->start_animation(1, "stand-right");
+      if(dir == LEFT)
+        tux_body->set_action("stand-left");
+      else // dir == RIGHT
+        tux_body->set_action("stand-right");
       }
-    else
+    else // moving
       {
-      tux_body->set_action("idle-left");
-      tux_body->start_animation(1, "stand-left");
+      if(dir == LEFT)
+        tux_body->set_action("walk-left");
+      else // dir == RIGHT
+        tux_body->set_action("walk-right");
       }
+    }
+
+  if(idle_timer.get_left() < 0)
+    {
+    if(size == BIG)
+      {
+      if(dir == LEFT)
+        tux_body->head->set_action("idle-left");
+      else // dir == RIGHT
+        tux_body->set_action("idle-right");
+
+      tux_body->head->start_animation(1);
+      }
+
     idle_timer.start(IDLE_TIME);
     }
-*/
+
   // Tux is holding something
   if ((holding_something && physic.get_velocity_y() == 0) ||
-      shooting_timer.check() && !duck)
+      shooting_timer.check())
     {
-    if (dir == RIGHT)
-      tux_body->arms->set_action("grab-right");
+    if (duck)
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("duck+grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
     else
-      tux_body->arms->set_action("grab-left");
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
     }
 
-  if(dying != DYING_SQUISHED && !growing_timer.check())
-    tux_body->draw(context, pos, layer);
+  /* Draw Tux */
+  if (dying == DYING_SQUISHED)
+    {
+    smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1);
+    }
+  else if(growing_timer.check())
+    {
+    if(size == SMALL)
+      {
+      if (dir == RIGHT)
+        context.draw_surface(growingtux_right[GROWING_FRAMES-1 - 
+                 ((growing_timer.get_gone() *
+                 GROWING_FRAMES) / GROWING_TIME)], pos, layer);
+      else
+        context.draw_surface(growingtux_left[GROWING_FRAMES-1 - 
+                ((growing_timer.get_gone() *
+                GROWING_FRAMES) / GROWING_TIME)], pos, layer);
+      }
+    else
+      {
+      if (dir == RIGHT)
+        context.draw_surface(growingtux_right[(growing_timer.get_gone() *
+                GROWING_FRAMES) / GROWING_TIME], pos, layer);
+      else
+        context.draw_surface(growingtux_left[(growing_timer.get_gone() *
+                             GROWING_FRAMES) / GROWING_TIME], pos, layer);
+      }
+    }
+  else if (safe_timer.started() && global_frame_counter%2)
+    ;  // don't draw Tux
+  else
+    tux_body->draw(context, pos, layer, dir == LEFT ? HORIZONTAL_FLIP : NONE_EFFECT);
 
   // 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))
   {
     if (size == SMALL || duck)
       smalltux_star->draw(context, pos, LAYER_OBJECTS + 2);