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

diff --git a/src/player.cpp b/src/player.cpp
index 624f18186..86bb7d2e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -24,7 +24,7 @@
 #include "gameloop.h"
 #include "app/globals.h"
 #include "player.h"
-#include "app/defines.h"
+#include "defines.h"
 #include "scene.h"
 #include "tile.h"
 #include "special/sprite.h"
@@ -40,10 +40,12 @@
 #define TILES_FOR_BUTTJUMP 3
 // animation times (in ms):
 #define SHOOTING_TIME 320
-#define STOMP_TIME 250
 // others stuff:
 #define AUTOSCROLL_DEAD_INTERVAL 300
 
+// time before idle animation starts
+#define IDLE_TIME 2500
+
 // growing animation
 Surface* growingtux_left[GROWING_FRAMES];
 Surface* growingtux_right[GROWING_FRAMES];
@@ -52,12 +54,12 @@ Surface* tux_life;
 
 Sprite* smalltux_gameover;
 Sprite* smalltux_star;
-Sprite* largetux_star;
+Sprite* bigtux_star;
 
-PlayerSprite smalltux;
-PlayerSprite largetux;
-PlayerSprite icetux;
-PlayerSprite firetux;
+TuxBodyParts* small_tux;
+TuxBodyParts* big_tux;
+TuxBodyParts* fire_tux;
+TuxBodyParts* ice_tux;
 
 PlayerKeymap keymap;
 
@@ -83,6 +85,46 @@ void player_input_init(player_input_type* pplayer_input)
   pplayer_input->activate = UP;
 }
 
+void
+TuxBodyParts::set_action(std::string 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::one_time_animation()
+{
+  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)
+{
+  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()
 {
   init();
@@ -118,7 +160,6 @@ Player::init()
   can_jump = true;
   butt_jump = false;
   
-  stomp_pos = Vector(0,0);
   frame_main = 0;
   frame_ = 0;
 
@@ -131,6 +172,7 @@ Player::init()
   kick_timer.init(true);
   shooting_timer.init(true);
   growing_timer.init(true);
+  idle_timer.init(true);
 
   physic.reset();
 }
@@ -138,6 +180,8 @@ Player::init()
 int
 Player::key_event(SDLKey key, int state)
 {
+  idle_timer.start(IDLE_TIME);
+
   if(key == keymap.right)
     {
       input.right = state;
@@ -203,6 +247,7 @@ Player::level_begin()
   safe_timer.init(true);
   frame_timer.init(true);
   growing_timer.init(true);
+  idle_timer.init(true);
 
   physic.reset();
 }
@@ -419,7 +464,7 @@ Player::handle_horizontal_input()
   if(on_ground() && ((vx < 0 && dirsign >0) || (vx>0 && dirsign<0))) {
       if(fabs(vx)>SKID_XM && !skidding_timer.check()) {
           skidding_timer.start(SKID_TIME);
-          sound_manager->play_sound(sounds[SND_SKID]);
+          SoundManager::get()->play_sound(IDToSound(SND_SKID));
           ax *= 2.5;
       } else {
           ax *= 2;
@@ -486,9 +531,9 @@ Player::handle_vertical_input()
       jumping = true;
       can_jump = false;
       if (size == SMALL)
-        sound_manager->play_sound(sounds[SND_JUMP]);
+        SoundManager::get()->play_sound(IDToSound(SND_JUMP));
       else
-        sound_manager->play_sound(sounds[SND_BIGJUMP]);
+        SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
     }
   // Let go of jump key
   else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
@@ -510,12 +555,11 @@ Player::handle_vertical_input()
   // Do butt jump
   if (butt_jump && on_ground() && size == BIG)
   {
-    
+    // Add a smoke cloud
     if (duck) 
-      stomp_pos = Vector(base.x - 32, base.y);
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y));
     else 
-      stomp_pos = Vector(base.x - 32, base.y + 32);    
-    stomp_timer.start(STOMP_TIME);
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y + 32));
     
     butt_jump = false;
 
@@ -681,111 +725,157 @@ Player::grabdistros()
       if(player_status.lives < MAX_LIVES)
         ++player_status.lives;
       /*We want to hear the sound even, if MAX_LIVES is reached*/
-      sound_manager->play_sound(sounds[SND_LIFEUP]);
+      SoundManager::get()->play_sound(IDToSound(SND_LIFEUP));
     }
 }
 
 void
 Player::draw(DrawingContext& context)
 {
-  PlayerSprite* sprite;
+  TuxBodyParts* tux_body;
           
   if (size == SMALL)
-    sprite = &smalltux;
+    tux_body = small_tux;
   else if (got_power == FIRE_POWER)
-    sprite = &firetux;
+    tux_body = fire_tux;
   else if (got_power == ICE_POWER)
-    sprite = &icetux;
+    tux_body = ice_tux;
   else
-    sprite = &largetux;
+    tux_body = big_tux;
 
   int layer = LAYER_OBJECTS - 1;
   Vector pos = Vector(base.x, base.y);
 
-  if (!safe_timer.started() || (global_frame_counter % 2) == 0)
+  /* 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 (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)
-                sprite->duck_right->draw(context, pos, layer);
-              else 
-                sprite->duck_left->draw(context, pos, layer);
-            }
-          else if (skidding_timer.started())
-            {
-              if (dir == RIGHT)
-                sprite->skid_right->draw(context, pos, layer);
-              else
-                sprite->skid_left->draw(context, pos, layer);
-            }
-          else if (kick_timer.started())
-            {
-              if (dir == RIGHT)
-                sprite->kick_right->draw(context, pos, layer);
-              else
-                sprite->kick_left->draw(context, pos, layer);
-            }
-          else if (physic.get_velocity_y() != 0)
-            {
-              if (dir == RIGHT)
-                sprite->jump_right->draw(context, pos, layer);
-              else
-                sprite->jump_left->draw(context, pos, layer);
-            }
-          else
-            {
-              if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
-                {
-                  if (dir == RIGHT)
-                    sprite->stand_right->draw(context, pos, layer);
-                  else
-                    sprite->stand_left->draw(context, pos, layer);
-                }
-              else // moving
-                {
-                  if (dir == RIGHT)
-                    sprite->walk_right->draw(context, pos, layer);
-                  else
-                    sprite->walk_left->draw(context, pos, layer);
-                }
-            }
-        }
-    }     
+    if(dir == LEFT)
+      tux_body->set_action("duck-left");
+    else // dir == RIGHT
+      tux_body->set_action("duck-right");
+    }
+  else if (skidding_timer.started())
+    {
+    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
+      {
+      if(dir == LEFT)
+        tux_body->set_action("stand-left");
+      else // dir == RIGHT
+        tux_body->set_action("stand-right");
+      }
+    else // moving
+      {
+      if(dir == LEFT)
+        tux_body->set_action("walk-left");
+      else // dir == RIGHT
+        tux_body->set_action("walk-right");
+      }
+    }
 
-  // Draw arm overlay graphics when Tux is holding something
-  if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck)
-  {
-    if (dir == RIGHT)
-      sprite->grab_right->draw(context, pos, LAYER_OBJECTS + 1);
+  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())
+    {
+    if (duck)
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("duck+grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
     else
-      sprite->grab_left->draw(context, pos, LAYER_OBJECTS + 1);
-  }
-  
-  // Draw stomp clouds when doing a butt jump
-  if (stomp_timer.check())
-      sprite->stomp->draw(context, stomp_pos, LAYER_OBJECTS + 1);
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("grab");
+      else // dir == RIGHT
+        tux_body->set_action("duck-right");
+      }
+    }
+
+  /* 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);
     else
-      largetux_star->draw(context, pos, LAYER_OBJECTS + 2);
+      bigtux_star->draw(context, pos, LAYER_OBJECTS + 2);
   }
  
   if (debug_mode)
@@ -923,7 +1013,7 @@ Player::kill(HurtMode mode)
   if(dying)
     return;
   
-  sound_manager->play_sound(sounds[SND_HURT]);
+  SoundManager::get()->play_sound(IDToSound(SND_HURT));
 
   physic.set_velocity_x(0);
 
@@ -931,15 +1021,17 @@ Player::kill(HurtMode mode)
     {
       if (got_power != NONE_POWER)
         {
+          safe_timer.start(TUX_SAFE_TIME);
           got_power = NONE_POWER;
         }
       else
         {
+          growing_timer.start(GROWING_TIME);
+          safe_timer.start(TUX_SAFE_TIME + GROWING_TIME);
           size = SMALL;
           base.height = 32;
           duck = false;
         }
-      safe_timer.start(TUX_SAFE_TIME);
     }
   else
     {