X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=3bc23df9f0d8381600b48bd6304957267d0df694;hb=9782ed41abee83f31a99d296b88ef495f4740fd0;hp=86bb7d2e0bf9cd2178549a82fa83957766be0520;hpb=5023c5b34da1b979a9bd829824662960bd3a7ff9;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 86bb7d2e0..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
@@ -116,13 +117,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()
@@ -157,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;
@@ -517,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 {
@@ -529,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
@@ -538,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 */
@@ -747,7 +777,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 +837,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 +852,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 +900,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);