X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=3bc23df9f0d8381600b48bd6304957267d0df694;hb=9782ed41abee83f31a99d296b88ef495f4740fd0;hp=b8be86e39d41f6feaf2c767ec35c6eed632f7d13;hpb=a390a884caf04434bf58e2580bb573f7df247c8c;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index b8be86e39..3bc23df9f 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -35,6 +35,7 @@
 #include "resources.h"
 #include "interactive_object.h"
 #include "video/screen.h"
+#include "statistics.h"
 
 // behavior definitions:
 #define TILES_FOR_BUTTJUMP 3
@@ -88,29 +89,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::one_time_animation()
 {
-head->start_animation(1);
-body->start_animation(1);
-arms->start_animation(1);
-feet->start_animation(1);
+  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-1, drawing_effect);
+  if(body != NULL)
+    body->draw(context, pos, layer-3, drawing_effect);
+  if(arms != NULL)
+    arms->draw(context, pos, layer,   drawing_effect);
+  if(feet != NULL)
+    feet->draw(context, pos, layer-2, drawing_effect);
 }
 
 Player::Player()
@@ -145,7 +158,10 @@ Player::init()
   last_ground_y = 0;
   fall_mode = ON_GROUND;
   jumping = false;
+  double_jumping = false;
   can_jump = true;
+  can_double_jump = false;
+  enable_hover = false;
   butt_jump = false;
   
   frame_main = 0;
@@ -505,6 +521,8 @@ Player::handle_vertical_input()
   // Press jump key
   if(input.up == DOWN && can_jump && on_ground())
     {
+      global_stats.add_points(JUMPS_STAT, 1);
+
       if(duck) { // only jump a little bit when in duck mode {
         physic.set_velocity_y(3);
       } else {
@@ -517,7 +535,9 @@ Player::handle_vertical_input()
 
       --base.y;
       jumping = true;
+		double_jumping = false;
       can_jump = false;
+		can_double_jump = false;
       if (size == SMALL)
         SoundManager::get()->play_sound(IDToSound(SND_JUMP));
       else
@@ -526,9 +546,31 @@ Player::handle_vertical_input()
   // Let go of jump key
   else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
     {
-      jumping = false;
+      if (!double_jumping && !duck) {can_double_jump = true;}
+		jumping = false;
       physic.set_velocity_y(0);
     }
+	
+	// Double jump
+	if (input.up == DOWN && can_double_jump)
+	  {
+			can_double_jump = false;
+			jumping = true;
+			double_jumping = true;
+			if (size == SMALL)
+            SoundManager::get()->play_sound(IDToSound(SND_JUMP));
+         else
+            SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
+			physic.set_velocity_y(5.2);
+	  }
+	
+	// Hover
+   //(disabled by default, use cheat code "hover" to toggle on/off)
+	//TODO: needs some tweaking, especially when used together with double jump and jumping off badguys
+	if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0)
+	  {
+			physic.set_velocity_y(-1);
+	  }
 
    /* In case the player has pressed Down while in a certain range of air,
       enable butt jump action */
@@ -735,82 +777,92 @@ 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 == RIGHT)
-      tux_body->set_action("duck-right");
-    else 
+    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 == RIGHT)
+    if(dir == LEFT)
+      tux_body->set_action("skid-left");
+    else // 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
+    if(dir == LEFT)
       tux_body->set_action("kick-left");
+    else // dir == RIGHT
+      tux_body->set_action("kick-right");
     }
   else if (butt_jump)
     {
-    if (dir == RIGHT)
-      tux_body->set_action("buttjump-right");
-    else
+    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 == RIGHT)
-      tux_body->set_action("jump-right");
-    else
+    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 == RIGHT)
-        tux_body->set_action("stand-right");
-      else
+      if(dir == LEFT)
         tux_body->set_action("stand-left");
+      else // dir == RIGHT
+        tux_body->set_action("stand-right");
       }
     else // moving
       {
-      if (dir == RIGHT)
-        tux_body->set_action("walk-right");
-      else
+      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 (dir == RIGHT)
-      {
-      tux_body->head->set_action("idle-right");
-      tux_body->head->start_animation(1);
-      }
-    else
+    if(size == BIG)
       {
-      tux_body->head->set_action("idle-right");
+      if(dir == LEFT)
+        tux_body->head->set_action("idle-left");
+      else // dir == RIGHT
+        tux_body->head->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-left");
+      else // dir == RIGHT
+        tux_body->arms->set_action("duck+grab-right");
+      }
     else
-      tux_body->arms->set_action("grab-left");
+      {
+      if(dir == LEFT)
+        tux_body->arms->set_action("grab-left");
+      else // dir == RIGHT
+        tux_body->arms->set_action("grab-right");
+      }
     }
 
   /* Draw Tux */
@@ -844,11 +896,12 @@ Player::draw(DrawingContext& context)
   else if (safe_timer.started() && global_frame_counter%2)
     ;  // don't draw Tux
   else
-    tux_body->draw(context, pos, layer);
+    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)
+     && !dying)
   {
     if (size == SMALL || duck)
       smalltux_star->draw(context, pos, LAYER_OBJECTS + 2);