X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.c;h=8b567cb72b2e3a11e2f9cf4766b1df1f21bcbcf9;hb=b9c029fdfbf54699ff0ebf2a64504ee40f6ec357;hp=b10a3346635e7ddf2ba99e5a471054be349c42fb;hpb=759712a08d75508ce1b834397ddc5ca0eb0cf973;p=supertux.git

diff --git a/src/player.c b/src/player.c
index b10a33466..8b567cb72 100644
--- a/src/player.c
+++ b/src/player.c
@@ -17,6 +17,20 @@
 #include "scene.h"
 #include "screen.h"
 
+texture_type tux_life,
+tux_right[3],  tux_left[3],
+bigtux_right[3],  bigtux_left[3],
+bigtux_right_jump,  bigtux_left_jump,
+ducktux_right,  ducktux_left,
+skidtux_right,  skidtux_left,
+firetux_right[3],  firetux_left[3],
+bigfiretux_right[3],  bigfiretux_left[3],
+bigfiretux_right_jump,  bigfiretux_left_jump,
+duckfiretux_right,  duckfiretux_left,
+skidfiretux_right,  skidfiretux_left,
+cape_right[2],  cape_left[2],
+bigcape_right[2],  bigcape_left[2];
+
 void player_init(player_type* pplayer)
 {
   pplayer->base.width = 32;
@@ -38,6 +52,8 @@ void player_init(player_type* pplayer)
   pplayer->frame_main = 0;
   pplayer->frame = 0;
   pplayer->lives = 3;
+  pplayer->score = 0;
+  pplayer->distros = 0;
 
   pplayer->input.down = UP;
   pplayer->input.fire = UP;
@@ -52,67 +68,39 @@ void player_init(player_type* pplayer)
   pplayer->keymap.right = SDLK_RIGHT;
   pplayer->keymap.fire = SDLK_LCTRL;
 
-  timer_init(&pplayer->invincible_timer);
-  timer_init(&pplayer->skidding_timer);
-  timer_init(&pplayer->safe_timer);
-}
-
-int player_keydown_event(player_type* pplayer, SDLKey key)
-{
-  if(key == pplayer->keymap.right)
-    {
-      pplayer->input.right = DOWN;
-      return YES;
-    }
-  else if( key == pplayer->keymap.left)
-    {
-      pplayer->input.left = DOWN;
-      return YES;
-    }
-  else if(key == pplayer->keymap.jump)
-    {
-      pplayer->input.up = DOWN;
-      return YES;
-    }
-  else if(key == pplayer->keymap.duck)
-    {
-      pplayer->input.down = DOWN;
-      return YES;
-    }
-  else if(key == pplayer->keymap.fire)
-    {
-      pplayer->input.fire = DOWN;
-      return YES;
-    }
-  else
-    return NO;
+  timer_init(&pplayer->invincible_timer,YES);
+  timer_init(&pplayer->skidding_timer,YES);
+  timer_init(&pplayer->safe_timer,YES);
+  timer_init(&pplayer->frame_timer,YES);
+  physic_init(&pplayer->hphysic);
+  physic_init(&pplayer->vphysic);
 }
 
-int player_keyup_event(player_type* pplayer, SDLKey key)
+int player_key_event(player_type* pplayer, SDLKey key, int state)
 {
   if(key == pplayer->keymap.right)
     {
-      pplayer->input.right = UP;
+      pplayer->input.right = state;
       return YES;
     }
   else if( key == pplayer->keymap.left)
     {
-      pplayer->input.left = UP;
+      pplayer->input.left = state;
       return YES;
     }
   else if(key == pplayer->keymap.jump)
     {
-      pplayer->input.up = UP;
+      pplayer->input.up = state;
       return YES;
     }
   else if(key == pplayer->keymap.duck)
     {
-      pplayer->input.down = UP;
+      pplayer->input.down = state;
       return YES;
     }
   else if(key == pplayer->keymap.fire)
     {
-      pplayer->input.fire = UP;
+      pplayer->input.fire = state;
       return YES;
     }
   else
@@ -133,6 +121,12 @@ void player_level_begin(player_type* pplayer)
   pplayer->input.right = UP;
   pplayer->input.up = UP;
 
+  timer_init(&pplayer->invincible_timer,YES);
+  timer_init(&pplayer->skidding_timer,YES);
+  timer_init(&pplayer->safe_timer,YES);
+  timer_init(&pplayer->frame_timer,YES);
+  physic_init(&pplayer->hphysic);
+  physic_init(&pplayer->vphysic);
 }
 
 void player_action(player_type* pplayer)
@@ -143,8 +137,8 @@ void player_action(player_type* pplayer)
 
   /* Move tux: */
 
-  pplayer->base.x= pplayer->base.x+ pplayer->base.xm * frame_ratio;
-  pplayer->base.y = pplayer->base.y + pplayer->base.ym * frame_ratio;
+  pplayer->base.x += pplayer->base.xm * frame_ratio;
+  pplayer->base.y += pplayer->base.ym * frame_ratio;
 
   player_keep_in_bounds(pplayer);
 
@@ -152,21 +146,144 @@ void player_action(player_type* pplayer)
 
   if (!pplayer->dying)
     {
-      if (issolid(pplayer->base.x, pplayer->base.y + 31) &&
-          !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y + 31))
+
+      /*if(physic_is_set(&pplayer->vphysic))
         {
-          while (issolid(pplayer->base.x, pplayer->base.y + 31))
+          pplayer->base.ym = physic_get_velocity(&pplayer->vphysic);
+        }
+      else
+        {*/
+      if( /*!issolid( pplayer->base.x + 16,  pplayer->base.y + pplayer->base.height )*/ !player_on_ground(pplayer))
+        {
+          if(!physic_is_set(&pplayer->vphysic))
             {
-              if (pplayer->base.xm < 0)
-                pplayer->base.x++;
-              else if (pplayer->base.xm > 0)
-                pplayer->base.x--;
+              physic_set_state(&pplayer->vphysic,PH_VT);
+              physic_set_start_vy(&pplayer->vphysic,0.);
             }
+          pplayer->base.ym = physic_get_velocity(&pplayer->vphysic);
+        }
+      else
+        {
+          /* Land: */
 
-          pplayer->base.xm = 0;
+          if (pplayer->base.ym > 0)
+            {
+              pplayer->base.y = (int)(((int)(pplayer->base.y +1) / 32) * 32);
+              pplayer->base.ym = 0;
+            }
+          physic_init(&pplayer->vphysic);
+        }
+
+      while(issolid( pplayer->base.x + 16,  pplayer->base.y + pplayer->base.height) && !issolid( pplayer->base.x + 16,  pplayer->base.y + 1))
+        {
+          --pplayer->base.y;
+        }
+      while(issolid( pplayer->base.x + 16,  pplayer->base.y + 1) && !issolid( pplayer->base.x + 16,  pplayer->base.y + pplayer->base.height))
+        {
+          ++pplayer->base.y;
+        }
+      while(issolid( pplayer->base.x - 1,  pplayer->base.y + 1) || issolid( pplayer->base.x - 1,  pplayer->base.y+pplayer->base.height))
+        {
+          ++pplayer->base.x;
+        }
+      while(issolid( pplayer->base.x + 32,  pplayer->base.y + 1) || issolid( pplayer->base.x + 32,  pplayer->base.y+pplayer->base.height))
+        {
+          --pplayer->base.x;
+        }
+
+      if(pplayer->base.ym < 0)
+        {
+
+          if (isbrick(pplayer->base.x, pplayer->base.y) ||
+              isfullbox(pplayer->base.x, pplayer->base.y))
+            {
+              trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
+              trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+
+              if(pplayer->size == BIG)
+                trybreakbrick(pplayer->base.x, pplayer->base.y);
+
+              bumpbrick(pplayer->base.x, pplayer->base.y);
+              tryemptybox(pplayer->base.x, pplayer->base.y);
+            }
+
+          if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
+              isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+            {
+              trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
+              trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
+
+              if(pplayer->size == BIG)
+                trybreakbrick(pplayer->base.x+ 31, pplayer->base.y);
+
+              bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
+              tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
+            }
+
+
+          if(pplayer->size == SMALL)
+            {
+              /* Get a distro from a brick? */
+
+              if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
+                  shape(pplayer->base.x, pplayer->base.y) == 'y')
+                {
+                  add_bouncy_distro((((int)pplayer->base.x)
+                                     / 32) * 32,
+                                    ((int)pplayer->base.y / 32) * 32);
+                  if (counting_distros == NO)
+                    {
+                      counting_distros = YES;
+                      distro_counter = 100;
+                    }
+
+                  if (distro_counter <= 0)
+                    level_change(&current_level,pplayer->base.x,pplayer->base.y - 1, 'a');
+
+                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+                  score = score + SCORE_DISTRO;
+                  distros++;
+                }
+              else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
+                       shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
+                {
+                  add_bouncy_distro((((int)pplayer->base.x + 31)
+                                     / 32) * 32,
+                                    ((int)pplayer->base.y / 32) * 32);
+                  if (counting_distros == NO)
+                    {
+                      counting_distros = YES;
+                      distro_counter = 100;
+                    }
+
+                  if (distro_counter <= 0)
+                    level_change(&current_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
+
+                  play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+                  score = score + SCORE_DISTRO;
+                  distros++;
+                }
+            }
         }
 
-      if (issolid(pplayer->base.x, pplayer->base.y) &&
+      player_grabdistros(pplayer);
+
+      /* FIXME: this code is COMPLETLY broken!!! */
+      /* if (issolid(pplayer->base.x, pplayer->base.y + 31) &&
+           !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y + 31))
+         {
+           while (issolid(pplayer->base.x, pplayer->base.y + 31))
+             {
+               if (pplayer->base.xm < 0)
+                 pplayer->base.x++;
+               else if (pplayer->base.xm > 0)
+                 pplayer->base.x--;
+             }
+
+           pplayer->base.xm = 0;
+         }*/
+
+      /*if (issolid(pplayer->base.x, pplayer->base.y) &&
           !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y))
         {
           while (issolid(pplayer->base.x, (pplayer->base.y)))
@@ -178,24 +295,24 @@ void player_action(player_type* pplayer)
             }
 
           pplayer->base.xm = 0;
-        }
+        }*/
 
-      if (issolid(pplayer->base.x, pplayer->base.y + 31))
+      /*if (issolid(pplayer->base.x, pplayer->base.y + 31))
         {
-          /* Set down properly: */
+          /* Set down properly: * /
 
           int debug_int = 0;
           while (issolid(pplayer->base.x, pplayer->base.y + 31))
             {
               ++debug_int;
               if(debug_int > 32)
-	      {
-                DEBUG_MSG("FIXME - UNDER certain circumstances I'm hanging in a loop here!");
-		              /*the circumstances are:
-               issolid() is true and base.ym == 0
-               use of floating point varibles for base stuff*/
-		break;
-		}
+                {
+                  DEBUG_MSG("FIXME - UNDER certain circumstances I'm hanging in a loop here!");
+                  /*the circumstances are:
+                  issolid() is true and base.ym == 0
+                  use of floating point varibles for base stuff* /
+                  break;
+                }
               if (pplayer->base.ym < 0)
                 pplayer->base.y++;
               else if (pplayer->base.ym > 0)
@@ -205,204 +322,291 @@ void player_action(player_type* pplayer)
 
           /* Reset score multiplier (for multi-hits): */
 
-          if (pplayer->base.ym > 0)
-            score_multiplier = 1;
+      if (pplayer->base.ym > 2)
+        score_multiplier = 1;
 
 
-          /* Stop jumping! */
+      /* Stop jumping! * /
 
+      pplayer->base.ym = 0;
+      pplayer->jumping = NO;
+      pplayer->input.up = UP;
+      }
+      /* FIXME: this code is COMPLETLY broken!!! */
+      /*if (issolid(pplayer->base.x, pplayer->base.y) ||
+          (pplayer->size == BIG && !pplayer->duck &&
+           (issolid(pplayer->base.x, pplayer->base.y - 32))))
+        {*/
+      /*if (!issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y) &&
+          (pplayer->size == SMALL || pplayer->duck ||
+           !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y - 32)))* /
+
+      if (((!issolid(pplayer->base.x, pplayer->base.y- pplayer->base.ym * frame_ratio) && (issolid(pplayer->base.x, pplayer->base.y) || issolid(pplayer->base.x, pplayer->base.y+31))))
+      ||((!issolid(pplayer->base.x - pplayer->base.xm * frame_ratio, pplayer->base.y) && (issolid(pplayer->base.x, pplayer->base.y) || issolid(pplayer->base.x+32, pplayer->base.y)))))
+          /*(pplayer->size == SMALL || pplayer->duck ||
+           !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y - 32))* /
+        {
+          pplayer->base.y = pplayer->base.y- pplayer->base.ym * frame_ratio;
           pplayer->base.ym = 0;
-          pplayer->jumping = NO;
-          pplayer->input.up = UP;
         }
 
+      if (((issolid(pplayer->base.x, pplayer->base.y) || issolid(pplayer->base.x+32, pplayer->base.y)) &&  (!issolid(pplayer->base.x - pplayer->base.xm * frame_ratio, pplayer->base.y))
+          /*(pplayer->size == SMALL || pplayer->duck ||
+           !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y - 32))* /) || 
+      (!issolid(pplayer->base.x - pplayer->base.xm * frame_ratio, pplayer->base.y+pplayer->base.height) && (issolid(pplayer->base.x, pplayer->base.y+pplayer->base.height) || issolid(pplayer->base.x +32, pplayer->base.y+pplayer->base.height))))
+        {
+      pplayer->base.x = pplayer->base.x- pplayer->base.xm * frame_ratio;
+          pplayer->base.xm = 0;
+        }
+
+          if (pplayer->base.ym <= 0)
+            {
+      if (isbrick(pplayer->base.x, pplayer->base.y) ||
+          isfullbox(pplayer->base.x, pplayer->base.y))
+        {
+          trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
+          trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+          bumpbrick(pplayer->base.x, pplayer->base.y);
+          tryemptybox(pplayer->base.x, pplayer->base.y);
+        }
+
+      if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
+          isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+        {
+          trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
+          trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
+          bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
+          tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
+        }
+      /* Get a distro from a brick? * /
+
+      if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
+          shape(pplayer->base.x, pplayer->base.y) == 'y')
+        {
+          add_bouncy_distro(((pplayer->base.x+ 1)
+                             / 32) * 32,
+                            (int)(pplayer->base.y / 32) * 32);
+
+          if (counting_distros == NO)
+            {
+              counting_distros = YES;
+              distro_counter = 100;
+            }
+
+          if (distro_counter <= 0)
+            level_change(&current_level,pplayer->base.x,pplayer->base.y, 'a');
 
-      /* Bump into things: */
+          play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+          score = score + SCORE_DISTRO;
+          distros++;
+        }
+      else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
+               shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
+        {
+          add_bouncy_distro(((pplayer->base.x+ 1 + 31)
+                             / 32) * 32,
+                            (int)(pplayer->base.y / 32) * 32);
+
+          if (counting_distros == NO)
+            {
+              counting_distros = YES;
+              distro_counter = 100;
+            }
+
+          if (distro_counter <= 0)
+            level_change(&current_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
+
+          play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+          score = score + SCORE_DISTRO;
+          distros++;
+        }
 
+      }
+      else
+      {
+      pplayer->base.ym = 0;
+      pplayer->jumping = NO;
+      timer_start(&pplayer->jump_timer,MAX_JUMP_TIME);
+      }
+      /*}*/
+      /* Bump into things: * /
+       
       if (issolid(pplayer->base.x, pplayer->base.y) ||
           (pplayer->size == BIG && !pplayer->duck &&
            (issolid(pplayer->base.x, pplayer->base.y - 32))))
         {
-          if (!issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y) &&
+       
+          if (!issolid(pplayer->base.x, pplayer->base.y - pplayer->base.ym) &&
               (pplayer->size == SMALL || pplayer->duck ||
-               !issolid(pplayer->base.x- pplayer->base.xm, pplayer->base.y - 32)))
-            {
-              pplayer->base.x = pplayer->base.x- pplayer->base.xm;
-              pplayer->base.xm = 0;
-            }
-          else if (!issolid(pplayer->base.x, pplayer->base.y - pplayer->base.ym) &&
-                   (pplayer->size == SMALL || pplayer->duck ||
-                    !issolid(pplayer->base.x, pplayer->base.y - 32 - pplayer->base.ym)))
+               !issolid(pplayer->base.x, pplayer->base.y - 32 - pplayer->base.ym)))
             {
               if (pplayer->base.ym <= 0)
                 {
                   /* Jumping up? */
+      /* FIXME: this code is COMPLETLY broken!!! */
+      if (pplayer->size == BIG)
+        {
+          /* Break bricks and empty boxes: * /
+
+          if (!pplayer->duck)
+            {
+              if (isbrick(pplayer->base.x, pplayer->base.y - 32) ||
+                  isfullbox(pplayer->base.x, pplayer->base.y - 32))
+                {
+                  trygrabdistro(pplayer->base.x, pplayer->base.y - 64, BOUNCE);
+                  trybumpbadguy(pplayer->base.x, pplayer->base.y - 96);
 
-                  if (pplayer->size == BIG)
+                  if (isfullbox(pplayer->base.x, pplayer->base.y - 32))
                     {
-                      /* Break bricks and empty boxes: */
+                      bumpbrick(pplayer->base.x, pplayer->base.y - 32);
+                    }
 
-                      if (!pplayer->duck)
-                        {
-                          if (isbrick(pplayer->base.x, pplayer->base.y - 32) ||
-                              isfullbox(pplayer->base.x, pplayer->base.y - 32))
-                            {
-                              trygrabdistro(pplayer->base.x, pplayer->base.y - 64, BOUNCE);
-                              trybumpbadguy(pplayer->base.x, pplayer->base.y - 96);
+                  trybreakbrick(pplayer->base.x, pplayer->base.y - 32);
+                  tryemptybox(pplayer->base.x, pplayer->base.y - 32);
+                }
 
-                              if (isfullbox(pplayer->base.x, pplayer->base.y - 32))
-                                {
-                                  bumpbrick(pplayer->base.x, pplayer->base.y - 32);
-                                }
+              if (isbrick(pplayer->base.x+ 31, pplayer->base.y - 32) ||
+                  isfullbox(pplayer->base.x+ 31, pplayer->base.y - 32))
+                {
+                  trygrabdistro(pplayer->base.x+ 31,
+                                pplayer->base.y - 64,
+                                BOUNCE);
+                  trybumpbadguy(pplayer->base.x+ 31,
+                                pplayer->base.y - 96);
 
-                              trybreakbrick(pplayer->base.x, pplayer->base.y - 32);
-                              tryemptybox(pplayer->base.x, pplayer->base.y - 32);
-                            }
+                  if (isfullbox(pplayer->base.x+ 31, pplayer->base.y - 32))
+                    {
+                      bumpbrick(pplayer->base.x+ 31, pplayer->base.y - 32);
+                    }
 
-                          if (isbrick(pplayer->base.x+ 31, pplayer->base.y - 32) ||
-                              isfullbox(pplayer->base.x+ 31, pplayer->base.y - 32))
-                            {
-                              trygrabdistro(pplayer->base.x+ 31,
-                                            pplayer->base.y - 64,
-                                            BOUNCE);
-                              trybumpbadguy(pplayer->base.x+ 31,
-                                            pplayer->base.y - 96);
-
-                              if (isfullbox(pplayer->base.x+ 31, pplayer->base.y - 32))
-                                {
-                                  bumpbrick(pplayer->base.x+ 31, pplayer->base.y - 32);
-                                }
-
-                              trybreakbrick(pplayer->base.x+ 31,
-                                            pplayer->base.y - 32);
-                              tryemptybox(pplayer->base.x+ 31,
-                                          pplayer->base.y - 32);
-                            }
-                        }
-                      else /* ducking */
-                        {
-                          if (isbrick(pplayer->base.x, pplayer->base.y) ||
-                              isfullbox(pplayer->base.x, pplayer->base.y))
-                            {
-                              trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
-                              trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
-                              if (isfullbox(pplayer->base.x, pplayer->base.y))
-                                bumpbrick(pplayer->base.x, pplayer->base.y);
-                              trybreakbrick(pplayer->base.x, pplayer->base.y);
-                              tryemptybox(pplayer->base.x, pplayer->base.y);
-                            }
+                  trybreakbrick(pplayer->base.x+ 31,
+                                pplayer->base.y - 32);
+                  tryemptybox(pplayer->base.x+ 31,
+                              pplayer->base.y - 32);
+                }
+            }
+          else /* ducking * /
+            {
+              if (isbrick(pplayer->base.x, pplayer->base.y) ||
+                  isfullbox(pplayer->base.x, pplayer->base.y))
+                {
+                  trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
+                  trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+                  if (isfullbox(pplayer->base.x, pplayer->base.y))
+                    bumpbrick(pplayer->base.x, pplayer->base.y);
+                  trybreakbrick(pplayer->base.x, pplayer->base.y);
+                  tryemptybox(pplayer->base.x, pplayer->base.y);
+                }
 
-                          if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
-                              isfullbox(pplayer->base.x+ 31, pplayer->base.y))
-                            {
-                              trygrabdistro(pplayer->base.x+ 31,
-                                            pplayer->base.y - 32,
-                                            BOUNCE);
-                              trybumpbadguy(pplayer->base.x+ 31,
-                                            pplayer->base.y - 64);
-                              if (isfullbox(pplayer->base.x+ 31, pplayer->base.y))
-                                bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
-                              trybreakbrick(pplayer->base.x+ 31, pplayer->base.y);
-                              tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
-                            }
-                        }
-                    }
-                  else
-                    {
-                      /* It's a brick and we're small, make the brick
-                         bounce, and grab any distros above it: */
+              if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
+                  isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+                {
+                  trygrabdistro(pplayer->base.x+ 31,
+                                pplayer->base.y - 32,
+                                BOUNCE);
+                  trybumpbadguy(pplayer->base.x+ 31,
+                                pplayer->base.y - 64);
+                  if (isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+                    bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
+                  trybreakbrick(pplayer->base.x+ 31, pplayer->base.y);
+                  tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
+                }
+            }
+          }
+          else
+          {
+          /* It's a brick and we're small, make the brick
+             bounce, and grab any distros above it: *  /
 
-                      if (isbrick(pplayer->base.x, pplayer->base.y) ||
-                          isfullbox(pplayer->base.x, pplayer->base.y))
-                        {
-                          trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
-                          trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
-                          bumpbrick(pplayer->base.x, pplayer->base.y);
-                          tryemptybox(pplayer->base.x, pplayer->base.y);
-                        }
+          if (isbrick(pplayer->base.x, pplayer->base.y) ||
+              isfullbox(pplayer->base.x, pplayer->base.y))
+            {
+              trygrabdistro(pplayer->base.x, pplayer->base.y - 32,BOUNCE);
+              trybumpbadguy(pplayer->base.x, pplayer->base.y - 64);
+              bumpbrick(pplayer->base.x, pplayer->base.y);
+              tryemptybox(pplayer->base.x, pplayer->base.y);
+            }
 
-                      if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
-                          isfullbox(pplayer->base.x+ 31, pplayer->base.y))
-                        {
-                          trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
-                          trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
-                          bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
-                          tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
-                        }
+          if (isbrick(pplayer->base.x+ 31, pplayer->base.y) ||
+              isfullbox(pplayer->base.x+ 31, pplayer->base.y))
+            {
+              trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32,BOUNCE);
+              trybumpbadguy(pplayer->base.x+ 31, pplayer->base.y - 64);
+              bumpbrick(pplayer->base.x+ 31, pplayer->base.y);
+              tryemptybox(pplayer->base.x+ 31, pplayer->base.y);
+            }
 
 
-                      /* Get a distro from a brick? */
+          /* Get a distro from a brick? * /
 
-                      if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
-                          shape(pplayer->base.x, pplayer->base.y) == 'y')
-                        {
-                          add_bouncy_distro(((pplayer->base.x+ 1)
-                                             / 32) * 32,
-                                            (int)(pplayer->base.y / 32) * 32);
+          if (shape(pplayer->base.x, pplayer->base.y) == 'x' ||
+              shape(pplayer->base.x, pplayer->base.y) == 'y')
+            {
+              add_bouncy_distro(((pplayer->base.x+ 1)
+                                 / 32) * 32,
+                                (int)(pplayer->base.y / 32) * 32);
 
-                          if (counting_distros == NO)
-                            {
-                              counting_distros = YES;
-                              distro_counter = 100;
-                            }
+              if (counting_distros == NO)
+                {
+                  counting_distros = YES;
+                  distro_counter = 100;
+                }
 
-                          if (distro_counter <= 0)
-                            level_change(&current_level,pplayer->base.x,pplayer->base.y, 'a');
+              if (distro_counter <= 0)
+                level_change(&current_level,pplayer->base.x,pplayer->base.y, 'a');
 
-                          play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                          score = score + SCORE_DISTRO;
-                          distros++;
-                        }
-                      else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
-                               shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
-                        {
-                          add_bouncy_distro(((pplayer->base.x+ 1 + 31)
-                                             / 32) * 32,
-                                            (int)(pplayer->base.y / 32) * 32);
+              play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+              score = score + SCORE_DISTRO;
+              distros++;
+            }
+          else if (shape(pplayer->base.x+ 31, pplayer->base.y) == 'x' ||
+                   shape(pplayer->base.x+ 31, pplayer->base.y) == 'y')
+            {
+              add_bouncy_distro(((pplayer->base.x+ 1 + 31)
+                                 / 32) * 32,
+                                (int)(pplayer->base.y / 32) * 32);
 
-                          if (counting_distros == NO)
-                            {
-                              counting_distros = YES;
-                              distro_counter = 100;
-                            }
+              if (counting_distros == NO)
+                {
+                  counting_distros = YES;
+                  distro_counter = 100;
+                }
 
-                          if (distro_counter <= 0)
-                            level_change(&current_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
+              if (distro_counter <= 0)
+                level_change(&current_level,pplayer->base.x+ 31, pplayer->base.y, 'a');
 
-                          play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-                          score = score + SCORE_DISTRO;
-                          distros++;
-                        }
-                    }
+              play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
+              score = score + SCORE_DISTRO;
+              distros++;
+            }
+          }
 
 
-                  /* Bump head: */
+          /* Bump head: * /
 
-                  pplayer->base.y = (int)(pplayer->base.y / 32) * 32 + 30;
-                }
-              else
-                {
-                  /* Land on feet: */
+          pplayer->base.y = (int)(pplayer->base.y / 32) * 32 + 30;
+          }
+          else
+          {
+          /* Land on feet: * /
 
-                  pplayer->base.y = (int)(pplayer->base.y / 32) * 32 - 32;
-                }
+          pplayer->base.y = (int)(pplayer->base.y / 32) * 32 - 32;
+          }
 
-              pplayer->base.ym = 0;
-              pplayer->jumping = NO;
-              /*pplayer->jump_counter = MAX_JUMP_COUNT;*/
-              /*timer_init(&pplayer->jump_timer);*/
-              timer_start(&pplayer->jump_timer,MAX_JUMP_TIME);
-            }
+          pplayer->base.ym = 0;
+          pplayer->jumping = NO;
+          timer_start(&pplayer->jump_timer,MAX_JUMP_TIME);
+          }*/
         }
     }
 
 
+  /*
+    player_grabdistros(pplayer);
+  */
 
-  player_grabdistros(pplayer);
-
-
-  /* Slow down horizontally: */
-
+  /* Slow down horizontally: * /
+   
   if (!pplayer->dying)
     {
       if (pplayer->input.right == UP && pplayer->input.left == UP)
@@ -410,35 +614,35 @@ void player_action(player_type* pplayer)
           if (isice(pplayer->base.x, pplayer->base.y + 32) ||
               !issolid(pplayer->base.x, pplayer->base.y + 32))
             {
-              /* Slowly on ice or in air: */
-
-              if (pplayer->base.xm > 0)
-                pplayer->base.xm--;
-              else if (pplayer->base.xm < 0)
-                pplayer->base.xm++;
-            }
-          else
-            {
-              /* Quickly, otherwise: */
+              /* Slowly on ice or in air: * /
 
-              pplayer->base.xm = pplayer->base.xm / 2;
-            }
-        }
+  if (pplayer->base.xm > 0)
+    pplayer->base.xm--;
+  else if (pplayer->base.xm < 0)
+    pplayer->base.xm++;
+  }
+  else
+  {
+    /* Quickly, otherwise: * /
 
+    pplayer->base.xm = pplayer->base.xm / 2;
+  }
+  }
 
-      /* Drop vertically: */
 
-      if (!issolid(pplayer->base.x, pplayer->base.y + 32))
-        {
-          pplayer->base.ym = pplayer->base.ym + GRAVITY;
+  /* Drop vertically: * /
 
-          if (pplayer->base.ym > MAX_YM)
-            pplayer->base.ym = MAX_YM;
-        }
-    }
+  if (!issolid(pplayer->base.x, pplayer->base.y + 32))
+  {
+    pplayer->base.ym = pplayer->base.ym + GRAVITY;
 
+    if (pplayer->base.ym > MAX_YM)
+      pplayer->base.ym = MAX_YM;
+  }
+  }
 
 
+  */
   timer_check(&pplayer->safe_timer);
 
 
@@ -487,6 +691,20 @@ void player_action(player_type* pplayer)
 
 }
 
+int player_on_ground(player_type *pplayer)
+{
+  if( issolid(pplayer->base.x + pplayer->base.width / 2, pplayer->base.y + pplayer->base.height + 1) ||
+      issolid(pplayer->base.x + 1, pplayer->base.y + pplayer->base.height + 1) ||
+      issolid(pplayer->base.x + pplayer->base.width - 1, pplayer->base.y + pplayer->base.height + 1)  )
+    {
+      return YES;
+    }
+  else
+    {
+      return NO;
+    }
+}
+
 void player_handle_horizontal_input(player_type *pplayer, int dir)
 {
   if (pplayer->jumping == NO)
@@ -569,536 +787,602 @@ void player_handle_horizontal_input(player_type *pplayer, int dir)
 
 void player_handle_vertical_input(player_type *pplayer)
 {
-        if(!timer_started(&pplayer->jump_timer))
-          {
-            timer_start(&pplayer->jump_timer,MAX_JUMP_TIME);
-
-
-            /* Taking off? */
-
-            if (!issolid(pplayer->base.x, pplayer->base.y + 32) ||
-                pplayer->base.ym != 0)
-              {
-                /* If they're not on the ground, or are currently moving
-                vertically, don't jump! */
-
-                pplayer->jumping = NO;
-                timer_stop(&pplayer->jump_timer);
-              }
-            else
-              {
-                /* Make sure we're not standing back up into a solid! */
-
-                if (pplayer->size == SMALL || pplayer->duck == NO ||
-                    !issolid(pplayer->base.x, pplayer->base.y))
-                  {
-                    pplayer->jumping = YES;
-
-                    if (pplayer->size == SMALL)
-                      play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
-                    else
-                      play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
-                  }
-              }
-          }
+  if(pplayer->input.up == DOWN)
+    {
+      if (player_on_ground(pplayer))
+        {
+          if(!physic_is_set(&pplayer->vphysic))
+            {
+              physic_set_state(&pplayer->vphysic,PH_VT);
+              physic_set_start_vy(&pplayer->vphysic,5.5);
+              --pplayer->base.y;
+              pplayer->jumping = YES;
+              if (pplayer->size == SMALL)
+                play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+              else
+                play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
+            }
+        }
+    }
+  else if(pplayer->input.up == UP && pplayer->jumping == YES)
+    {
+      if (issolid(pplayer->base.x + 16, pplayer->base.y + pplayer->base.height + 1))
+        {
+          physic_init(&pplayer->vphysic);
+          pplayer->jumping == NO;
+        }
+      else
+        {
+          pplayer->jumping = NO;
+          if(physic_is_set(&pplayer->vphysic))
+            {
+              if(physic_get_velocity(&pplayer->vphysic) < 0.)
+                {
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                  physic_set_start_vy(&pplayer->vphysic,0);
+                }
+            }
+          else
+            {
+              if(!physic_is_set(&pplayer->vphysic))
+                {
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                }
+            }
+        }
+    }
 
-        /* Keep jumping for a while: */
+  /* Taking off? * /
 
-        if (timer_check(&pplayer->jump_timer))
-          {
-            pplayer->base.ym = pplayer->base.ym - JUMP_SPEED * frame_ratio;
-            if (pplayer->base.ym < -YM_FOR_JUMP)
-              pplayer->base.ym = -YM_FOR_JUMP;
-          }
-      }
-   
-  void player_input(player_type *pplayer)
-  {
-    /* Handle key and joystick state: */
+  if (!issolid(pplayer->base.x, pplayer->base.y + 32) ||
+      pplayer->base.ym != 0)
+    {
+      /* If they're not on the ground, or are currently moving
+      vertically, don't jump! * /
 
+      pplayer->jumping = NO;
+      timer_stop(&pplayer->jump_timer);
+    }
+  else
+    {
+      /* Make sure we're not standing back up into a solid! * /
 
-    if (pplayer->input.right == DOWN && pplayer->input.left == UP)
-      {
-        player_handle_horizontal_input(pplayer,RIGHT);
-      }
-    else if (pplayer->input.left == DOWN && pplayer->input.right == UP)
-      {
-        player_handle_horizontal_input(pplayer,LEFT);
-      }
+      if (pplayer->size == SMALL || pplayer->duck == NO ||
+          !issolid(pplayer->base.x, pplayer->base.y))
+        {
+          pplayer->jumping = YES;
 
-    /* Jump/jumping? */
+          if (pplayer->size == SMALL)
+            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+          else
+            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
+        }
+    }*/
 
-    if ( pplayer->input.up == DOWN)
-      {
-       player_handle_vertical_input(pplayer);
-      }
-    else
-      timer_stop(&pplayer->jump_timer);
-      
-    /* Shoot! */
+  /* Keep jumping for a while: * /
 
-    if (pplayer->input.fire == DOWN && pplayer->input.old_fire == UP && pplayer->got_coffee)
-      {
-        add_bullet(pplayer->base.x, pplayer->base.y, pplayer->base.xm, pplayer->dir);
-      }
+  if (timer_check(&pplayer->jump_timer))
+    {
+      pplayer->base.ym = pplayer->base.ym - JUMP_SPEED * frame_ratio;
+      if (pplayer->base.ym < -YM_FOR_JUMP)
+        pplayer->base.ym = pplayer->base.ym/*-YM_FOR_JUMP* /;
+    }*/
+}
 
+void player_input(player_type *pplayer)
+{
+  /* Handle key and joystick state: */
 
-    /* Duck! */
 
-    if (pplayer->input.down == DOWN)
-      {
-        if (pplayer->size == BIG)
-          pplayer->duck = YES;
-      }
-    else
-      {
-        if (pplayer->size == BIG && pplayer->duck == YES)
-          {
-            /* Make sure we're not standing back up into a solid! */
+  if (pplayer->input.right == DOWN && pplayer->input.left == UP)
+    {
+      player_handle_horizontal_input(pplayer,RIGHT);
+    }
+  else if (pplayer->input.left == DOWN && pplayer->input.right == UP)
+    {
+      player_handle_horizontal_input(pplayer,LEFT);
+    }
+  else
+    {
+      if(pplayer->base.xm > 0)
+        {
+          pplayer->base.xm = (int)(pplayer->base.xm - frame_ratio);
+          if(pplayer->base.xm < 0)
+            pplayer->base.xm = 0;
+        }
+      else if(pplayer->base.xm < 0)
+        {
+          pplayer->base.xm = (int)(pplayer->base.xm + frame_ratio);
+          if(pplayer->base.xm > 0)
+            pplayer->base.xm = 0;
+        }
+    }
 
-            if (!issolid(pplayer->base.x, pplayer->base.y - 32))
-              pplayer->duck = NO;
-          }
-        else
-          pplayer->duck = NO;
-      }
+  /* Jump/jumping? */
+
+  if ( pplayer->input.up == DOWN || (pplayer->input.up == UP && pplayer->jumping == YES))
+    {
+      player_handle_vertical_input(pplayer);
+    }
 
-    /* (Tux): */
+  /* Shoot! */
 
-    if (pplayer->input.right == UP && pplayer->input.left == UP)
-      {
-        pplayer->frame_main = 1;
-        pplayer->frame = 1;
-      }
-    else
-      {
-        if ((pplayer->input.fire == DOWN && (frame % 2) == 0) ||
-            (frame % 4) == 0)
-          pplayer->frame_main = (pplayer->frame_main + 1) % 4;
+  if (pplayer->input.fire == DOWN && pplayer->input.old_fire == UP && pplayer->got_coffee)
+    {
+      add_bullet(pplayer->base.x, pplayer->base.y, pplayer->base.xm, pplayer->dir);
+    }
+
+
+  /* Duck! */
+
+  if (pplayer->input.down == DOWN)
+    {
+      if (pplayer->size == BIG)
+        pplayer->duck = YES;
+    }
+  else
+    {
+      if (pplayer->size == BIG && pplayer->duck == YES)
+        {
+          /* Make sure we're not standing back up into a solid! */
 
-        pplayer->frame = pplayer->frame_main;
+          if (!issolid(pplayer->base.x + 16, pplayer->base.y - 16))
+            pplayer->duck = NO;
+        }
+      else
+        pplayer->duck = NO;
+    }
 
-        if (pplayer->frame == 3)
+  /* (Tux): */
+
+  if(!timer_check(&pplayer->frame_timer))
+    {
+      timer_start(&pplayer->frame_timer,25);
+      if (pplayer->input.right == UP && pplayer->input.left == UP)
+        {
+          pplayer->frame_main = 1;
           pplayer->frame = 1;
-      }
+        }
+      else
+        {
+          if ((pplayer->input.fire == DOWN && (frame % 2) == 0) ||
+              (frame % 4) == 0)
+            pplayer->frame_main = (pplayer->frame_main + 1) % 4;
 
-  }
+          pplayer->frame = pplayer->frame_main;
 
-  void player_grabdistros(player_type *pplayer)
-  {
-    /* Grab distros: */
-    if (!pplayer->dying)
-      {
-        trygrabdistro(pplayer->base.x, pplayer->base.y, NO_BOUNCE);
-        trygrabdistro(pplayer->base.x+ 31, pplayer->base.y, NO_BOUNCE);
+          if (pplayer->frame == 3)
+            pplayer->frame = 1;
+        }
+    }
 
-        if (pplayer->size == BIG && !pplayer->duck)
-          {
-            trygrabdistro(pplayer->base.x, pplayer->base.y - 32, NO_BOUNCE);
-            trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32, NO_BOUNCE);
-          }
-      }
+}
 
+void player_grabdistros(player_type *pplayer)
+{
+  /* Grab distros: */
+  if (!pplayer->dying)
+    {
+      trygrabdistro(pplayer->base.x, pplayer->base.y, NO_BOUNCE);
+      trygrabdistro(pplayer->base.x+ 31, pplayer->base.y, NO_BOUNCE);
 
-    /* Enough distros for a One-up? */
+      trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height, NO_BOUNCE);
+      trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height, NO_BOUNCE);
 
-    if (distros >= DISTROS_LIFEUP)
-      {
-        distros = distros - DISTROS_LIFEUP;
-        if(pplayer->lives < MAX_LIVES)
-          pplayer->lives++;
-        /*We want to hear the sound even, if MAX_LIVES is reached*/
-        play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
-      }
-  }
+      if(pplayer->size == BIG)
+        {
+          trygrabdistro(pplayer->base.x, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
+          trygrabdistro(pplayer->base.x+ 31, pplayer->base.y + pplayer->base.height / 2, NO_BOUNCE);
+        }
 
-  void player_draw(player_type* pplayer)
-  {
-    if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0)
-      {
-        if (pplayer->size == SMALL)
-          {
-            if (timer_started(&pplayer->invincible_timer))
-              {
-                /* Draw cape: */
-
-                if (pplayer->dir == RIGHT)
-                  {
-                    texture_draw(&cape_right[frame % 2],
-                                 pplayer->base.x- scroll_x, pplayer->base.y,
-                                 NO_UPDATE);
-                  }
-                else
-                  {
-                    texture_draw(&cape_left[frame % 2],
-                                 pplayer->base.x- scroll_x, pplayer->base.y,
-                                 NO_UPDATE);
-                  }
-              }
-
-
-            if (!pplayer->got_coffee)
-              {
-                if (pplayer->dir == RIGHT)
-                  {
-                    texture_draw(&tux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
-                  }
-                else
-                  {
-                    texture_draw(&tux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
-                  }
-              }
-            else
-              {
-                /* Tux got coffee! */
-
-                if (pplayer->dir == RIGHT)
-                  {
-                    texture_draw(&firetux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
-                  }
-                else
-                  {
-                    texture_draw(&firetux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
-                  }
-              }
-          }
-        else
-          {
-            if (timer_started(&pplayer->invincible_timer))
-              {
-                /* Draw cape: */
-
-                if (pplayer->dir == RIGHT)
-                  {
-                    texture_draw(&bigcape_right[frame % 2],
-                                 pplayer->base.x- scroll_x - 8 - 16, pplayer->base.y - 32,
-                                 NO_UPDATE);
-                  }
-                else
-                  {
-                    texture_draw(&bigcape_left[frame % 2],
-                                 pplayer->base.x-scroll_x - 8, pplayer->base.y - 32,
-                                 NO_UPDATE);
-                  }
-              }
-
-            if (!pplayer->got_coffee)
-              {
-                if (!pplayer->duck)
-                  {
-                    if (!timer_started(&pplayer->skidding_timer))
-                      {
-                        if (!pplayer->jumping || pplayer->base.ym > 0)
-                          {
-                            if (pplayer->dir == RIGHT)
-                              {
-                                texture_draw(&bigtux_right[pplayer->frame],
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                            else
-                              {
-                                texture_draw(&bigtux_left[pplayer->frame],
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                          }
-                        else
-                          {
-                            if (pplayer->dir == RIGHT)
-                              {
-                                texture_draw(&bigtux_right_jump,
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                            else
-                              {
-                                texture_draw(&bigtux_left_jump,
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                          }
-                      }
-                    else
-                      {
-                        if (pplayer->dir == RIGHT)
-                          {
-                            texture_draw(&skidtux_right,
-                                         pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                         NO_UPDATE);
-                          }
-                        else
-                          {
-                            texture_draw(&skidtux_left,
-                                         pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                         NO_UPDATE);
-                          }
-                      }
-                  }
-                else
-                  {
-                    if (pplayer->dir == RIGHT)
-                      {
-                        texture_draw(&ducktux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
-                                     NO_UPDATE);
-                      }
-                    else
-                      {
-                        texture_draw(&ducktux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
-                                     NO_UPDATE);
-                      }
-                  }
-              }
-            else
-              {
-                /* Tux has coffee! */
-
-                if (!pplayer->duck)
-                  {
-                    if (!timer_started(&pplayer->skidding_timer))
-                      {
-                        if (!pplayer->jumping || pplayer->base.ym > 0)
-                          {
-                            if (pplayer->dir == RIGHT)
-                              {
-                                texture_draw(&bigfiretux_right[pplayer->frame],
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                            else
-                              {
-                                texture_draw(&bigfiretux_left[pplayer->frame],
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                          }
-                        else
-                          {
-                            if (pplayer->dir == RIGHT)
-                              {
-                                texture_draw(&bigfiretux_right_jump,
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                            else
-                              {
-                                texture_draw(&bigfiretux_left_jump,
-                                             pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                             NO_UPDATE);
-                              }
-                          }
-                      }
-                    else
-                      {
-                        if (pplayer->dir == RIGHT)
-                          {
-                            texture_draw(&skidfiretux_right,
-                                         pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                         NO_UPDATE);
-                          }
-                        else
-                          {
-                            texture_draw(&skidfiretux_left,
-                                         pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
-                                         NO_UPDATE);
-                          }
-                      }
-                  }
-                else
-                  {
-                    if (pplayer->dir == RIGHT)
-                      {
-                        texture_draw(&duckfiretux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
-                                     NO_UPDATE);
-                      }
-                    else
-                      {
-                        texture_draw(&duckfiretux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
-                                     NO_UPDATE);
-                      }
-                  }
-              }
-          }
-      }
-  }
+    }
 
-  void player_collision(player_type* pplayer, void* p_c_object, int c_object)
-  {
-    bad_guy_type* pbad_c = NULL;
 
-    switch (c_object)
-      {
-      case CO_BADGUY:
-        pbad_c = p_c_object;
-        /* Hurt the player if he just touched it: */
+  /* Enough distros for a One-up? */
 
-        if (!pbad_c->dying && !pplayer->dying &&
-            !timer_started(&pplayer->safe_timer) &&
-            pbad_c->mode != HELD)
-          {
-            if (pbad_c->mode == FLAT  && pplayer->input.fire != DOWN)
-              {
-                /* Kick: */
-
-                pbad_c->mode = KICK;
-                play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
-
-                if (pplayer->base.x<= pbad_c->base.x)
-                  {
-                    pbad_c->dir = RIGHT;
-                    pbad_c->base.x = pbad_c->base.x + 16;
-                  }
-                else
-                  {
-                    pbad_c->dir = LEFT;
-                    pbad_c->base.x = pbad_c->base.x - 16;
-                  }
-
-                timer_start(&pbad_c->timer,5000);
-              }
-            else if (pbad_c->mode == FLAT && pplayer->input.fire == DOWN)
-              {
-                pbad_c->mode = HELD;
-                pbad_c->base.y-=8;
-              }
-            else if (pbad_c->mode == KICK)
-              {
-                if (pplayer->base.y < pbad_c->base.y - 16 &&
-                    timer_started(&pbad_c->timer))
-                  {
-                    /* Step on (stop being kicked) */
-
-                    pbad_c->mode = FLAT;
-                    play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
-                    timer_start(&pbad_c->timer, 10000);
-                  }
-                else
-                  {
-                    /* Hurt if you get hit by kicked laptop: */
-
-                    if (timer_started(&pbad_c->timer))
-                      {
-                        if (!timer_started(&pplayer->invincible_timer))
-                          {
-                            player_kill(pplayer,SHRINK);
-                          }
-                        else
-                          {
-                            pbad_c->dying = FALLING;
-                            pbad_c->base.ym = -8;
-                            play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                          }
-                      }
-                  }
-              }
-            else
-              {
-                if (!timer_started(&pplayer->invincible_timer ))
-                  {
-                    player_kill(pplayer,SHRINK);
-                  }
-                else
-                  {
-                    pbad_c->dying = FALLING;
-                    pbad_c->base.ym = -8;
-                    play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                  }
-              }
-          }
-        score_multiplier++;
-        break;
-      }
+  if (distros >= DISTROS_LIFEUP)
+    {
+      distros = distros - DISTROS_LIFEUP;
+      if(pplayer->lives < MAX_LIVES)
+        pplayer->lives++;
+      /*We want to hear the sound even, if MAX_LIVES is reached*/
+      play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER);
+    }
+}
 
-  }
+void player_draw(player_type* pplayer)
+{
+  if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0)
+    {
+      if (pplayer->size == SMALL)
+        {
+          if (timer_started(&pplayer->invincible_timer))
+            {
+              /* Draw cape: */
 
-  /* Kill Player! */
+              if (pplayer->dir == RIGHT)
+                {
+                  texture_draw(&cape_right[frame % 2],
+                               pplayer->base.x- scroll_x, pplayer->base.y,
+                               NO_UPDATE);
+                }
+              else
+                {
+                  texture_draw(&cape_left[frame % 2],
+                               pplayer->base.x- scroll_x, pplayer->base.y,
+                               NO_UPDATE);
+                }
+            }
 
-  void player_kill(player_type* pplayer, int mode)
-  {
-    pplayer->base.ym = -5;
 
-    play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
+          if (!pplayer->got_coffee)
+            {
+              if (pplayer->dir == RIGHT)
+                {
+                  texture_draw(&tux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
+                }
+              else
+                {
+                  texture_draw(&tux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
+                }
+            }
+          else
+            {
+              /* Tux got coffee! */
 
-    if (pplayer->dir == RIGHT)
-      pplayer->base.xm = -8;
-    else if (pplayer->dir == LEFT)
-      pplayer->base.xm = 8;
+              if (pplayer->dir == RIGHT)
+                {
+                  texture_draw(&firetux_right[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
+                }
+              else
+                {
+                  texture_draw(&firetux_left[pplayer->frame], pplayer->base.x- scroll_x, pplayer->base.y, NO_UPDATE);
+                }
+            }
+        }
+      else
+        {
+          if (timer_started(&pplayer->invincible_timer))
+            {
+              /* Draw cape: */
 
-    if (mode == SHRINK && pplayer->size == BIG)
-      {
-        if (pplayer->got_coffee)
-          pplayer->got_coffee = NO;
+              if (pplayer->dir == RIGHT)
+                {
+                  texture_draw(&bigcape_right[frame % 2],
+                               pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                               NO_UPDATE);
+                }
+              else
+                {
+                  texture_draw(&bigcape_left[frame % 2],
+                               pplayer->base.x-scroll_x - 8, pplayer->base.y,
+                               NO_UPDATE);
+                }
+            }
 
-        pplayer->size = SMALL;
+          if (!pplayer->got_coffee)
+            {
+              if (!pplayer->duck)
+                {
+                  if (!timer_started(&pplayer->skidding_timer))
+                    {
+                      if (!pplayer->jumping || pplayer->base.ym > 0)
+                        {
+                          if (pplayer->dir == RIGHT)
+                            {
+                              texture_draw(&bigtux_right[pplayer->frame],
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                          else
+                            {
+                              texture_draw(&bigtux_left[pplayer->frame],
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                        }
+                      else
+                        {
+                          if (pplayer->dir == RIGHT)
+                            {
+                              texture_draw(&bigtux_right_jump,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                          else
+                            {
+                              texture_draw(&bigtux_left_jump,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                        }
+                    }
+                  else
+                    {
+                      if (pplayer->dir == RIGHT)
+                        {
+                          texture_draw(&skidtux_right,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                       NO_UPDATE);
+                        }
+                      else
+                        {
+                          texture_draw(&skidtux_left,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                       NO_UPDATE);
+                        }
+                    }
+                }
+              else
+                {
+                  if (pplayer->dir == RIGHT)
+                    {
+                      texture_draw(&ducktux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                   NO_UPDATE);
+                    }
+                  else
+                    {
+                      texture_draw(&ducktux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                   NO_UPDATE);
+                    }
+                }
+            }
+          else
+            {
+              /* Tux has coffee! */
 
-        timer_start(&pplayer->safe_timer,TUX_SAFE_TIME);
-      }
-    else
-      {
-        pplayer->dying = 1;
-      }
-  }
+              if (!pplayer->duck)
+                {
+                  if (!timer_started(&pplayer->skidding_timer))
+                    {
+                      if (!pplayer->jumping || pplayer->base.ym > 0)
+                        {
+                          if (pplayer->dir == RIGHT)
+                            {
+                              texture_draw(&bigfiretux_right[pplayer->frame],
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                          else
+                            {
+                              texture_draw(&bigfiretux_left[pplayer->frame],
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                        }
+                      else
+                        {
+                          if (pplayer->dir == RIGHT)
+                            {
+                              texture_draw(&bigfiretux_right_jump,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                          else
+                            {
+                              texture_draw(&bigfiretux_left_jump,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                           NO_UPDATE);
+                            }
+                        }
+                    }
+                  else
+                    {
+                      if (pplayer->dir == RIGHT)
+                        {
+                          texture_draw(&skidfiretux_right,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                       NO_UPDATE);
+                        }
+                      else
+                        {
+                          texture_draw(&skidfiretux_left,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                       NO_UPDATE);
+                        }
+                    }
+                }
+              else
+                {
+                  if (pplayer->dir == RIGHT)
+                    {
+                      texture_draw(&duckfiretux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                   NO_UPDATE);
+                    }
+                  else
+                    {
+                      texture_draw(&duckfiretux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y,
+                                   NO_UPDATE);
+                    }
+                }
+            }
+        }
+    }
+}
 
-  void player_dying(player_type *pplayer)
-  {
-    pplayer->base.ym = pplayer->base.ym + GRAVITY;
+void player_collision(player_type* pplayer, void* p_c_object, int c_object)
+{
+  bad_guy_type* pbad_c = NULL;
 
-    /* He died :^( */
+  switch (c_object)
+    {
+    case CO_BADGUY:
+      pbad_c = (bad_guy_type*) p_c_object;
+      /* Hurt the player if he just touched it: */
 
-    --pplayer->lives;
-    player_remove_powerups(pplayer);
-    pplayer->dying = NO;
+      if (!pbad_c->dying && !pplayer->dying &&
+          !timer_started(&pplayer->safe_timer) &&
+          pbad_c->mode != HELD)
+        {
+          if (pbad_c->mode == FLAT  && pplayer->input.fire != DOWN)
+            {
+              /* Kick: */
 
-    player_level_begin(pplayer);
+              pbad_c->mode = KICK;
+              play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
 
-  }
+              if (pplayer->base.x<= pbad_c->base.x)
+                {
+                  pbad_c->dir = RIGHT;
+                  pbad_c->base.x = pbad_c->base.x + 16;
+                }
+              else
+                {
+                  pbad_c->dir = LEFT;
+                  pbad_c->base.x = pbad_c->base.x - 16;
+                }
 
-  /* Remove Tux's power ups */
-  void player_remove_powerups(player_type* pplayer)
-  {
-    pplayer->got_coffee = NO;
-    pplayer->size = SMALL;
-  }
+              timer_start(&pbad_c->timer,5000);
+            }
+          else if (pbad_c->mode == FLAT && pplayer->input.fire == DOWN)
+            {
+              pbad_c->mode = HELD;
+              pbad_c->base.y-=8;
+            }
+          else if (pbad_c->mode == KICK)
+            {
+              if (pplayer->base.y < pbad_c->base.y - 16 &&
+                  timer_started(&pbad_c->timer))
+                {
+                  /* Step on (stop being kicked) */
 
-  void player_keep_in_bounds(player_type* pplayer)
-  {
-    /* Keep tux in bounds: */
-    if (pplayer->base.x< 0)
-      pplayer->base.x= 0;
-    else if(pplayer->base.x< scroll_x)
-      pplayer->base.x= scroll_x;
-    else if (pplayer->base.x< 160 + scroll_x && scroll_x > 0 && debug_mode == YES)
-      {
-        scroll_x = pplayer->base.x- 160;
-        /*pplayer->base.x+= 160;*/
+                  pbad_c->mode = FLAT;
+                  play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
+                  timer_start(&pbad_c->timer, 10000);
+                }
+              else
+                {
+                  /* Hurt if you get hit by kicked laptop: */
+
+                  if (timer_started(&pbad_c->timer))
+                    {
+                      if (!timer_started(&pplayer->invincible_timer))
+                        {
+                          player_kill(pplayer,SHRINK);
+                        }
+                      else
+                        {
+                          pbad_c->dying = FALLING;
+                          physic_set_state(&pplayer->vphysic,PH_VT);
+                          physic_set_start_vy(&pplayer->vphysic,-2.);
+                          play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
+                        }
+                    }
+                }
+            }
+          else
+            {
+              if (!timer_started(&pplayer->invincible_timer ))
+                {
+                  player_kill(pplayer,SHRINK);
+                }
+              else
+                {
+                  pbad_c->dying = FALLING;
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                  physic_set_start_vy(&pplayer->vphysic,-2.);
+                  play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
+                }
+            }
+          score_multiplier++;
+        }
+      break;
+    default:
+      break;
+    }
 
-        if(scroll_x < 0)
-          scroll_x = 0;
+}
 
-      }
-    else if (pplayer->base.x> screen->w / 2 + scroll_x && scroll_x < ((current_level.width * 32) - screen->w))
-      {
-        /* Scroll the screen in past center: */
+/* Kill Player! */
 
-        scroll_x = pplayer->base.x- screen->w / 2;
-        /*pplayer->base.x= 320 + scroll_x;*/
+void player_kill(player_type* pplayer, int mode)
+{
+  pplayer->base.ym = -5;
 
-        if (scroll_x > ((current_level.width * 32) - screen->w))
-          scroll_x = ((current_level.width * 32) - screen->w);
-      }
-    else if (pplayer->base.x> 608 + scroll_x)
-      {
-        /* ... unless there's no more to scroll! */
+  play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER);
 
-        /*pplayer->base.x= 608 + scroll_x;*/
-      }
+  if (pplayer->dir == RIGHT)
+    pplayer->base.xm = -8;
+  else if (pplayer->dir == LEFT)
+    pplayer->base.xm = 8;
 
-    /* Keep in-bounds, vertically: */
+  if (mode == SHRINK && pplayer->size == BIG)
+    {
+      if (pplayer->got_coffee)
+        pplayer->got_coffee = NO;
 
-    if (pplayer->base.y < 0)
-      pplayer->base.y = 0;
-    else if (pplayer->base.y > screen->h)
-      {
-        player_kill(&tux,KILL);
-      }
-  }
+      pplayer->size = SMALL;
+      pplayer->base.height = 32;
+
+      timer_start(&pplayer->safe_timer,TUX_SAFE_TIME);
+    }
+  else
+    {
+      pplayer->dying = 1;
+    }
+}
+
+void player_dying(player_type *pplayer)
+{
+  pplayer->base.ym = pplayer->base.ym + gravity;
+
+  /* He died :^( */
+
+  --pplayer->lives;
+  player_remove_powerups(pplayer);
+  pplayer->dying = NO;
+
+  player_level_begin(pplayer);
+
+}
+
+/* Remove Tux's power ups */
+void player_remove_powerups(player_type* pplayer)
+{
+  pplayer->got_coffee = NO;
+  pplayer->size = SMALL;
+  pplayer->base.height = 32;
+}
+
+void player_keep_in_bounds(player_type* pplayer)
+{
+  /* Keep tux in bounds: */
+  if (pplayer->base.x< 0)
+    pplayer->base.x= 0;
+  else if(pplayer->base.x< scroll_x)
+    pplayer->base.x= scroll_x;
+  else if (pplayer->base.x< 160 + scroll_x && scroll_x > 0 && debug_mode == YES)
+    {
+      scroll_x = pplayer->base.x- 160;
+      /*pplayer->base.x+= 160;*/
+
+      if(scroll_x < 0)
+        scroll_x = 0;
+
+    }
+  else if (pplayer->base.x> screen->w / 2 + scroll_x && scroll_x < ((current_level.width * 32) - screen->w))
+    {
+      /* Scroll the screen in past center: */
+
+      scroll_x = pplayer->base.x- screen->w / 2;
+      /*pplayer->base.x= 320 + scroll_x;*/
+
+      if (scroll_x > ((current_level.width * 32) - screen->w))
+        scroll_x = ((current_level.width * 32) - screen->w);
+    }
+  else if (pplayer->base.x> 608 + scroll_x)
+    {
+      /* ... unless there's no more to scroll! */
+
+      /*pplayer->base.x= 608 + scroll_x;*/
+    }
+
+  /* Keep in-bounds, vertically: */
+
+  if (pplayer->base.y < 0)
+    pplayer->base.y = 0;
+  else if (pplayer->base.y > screen->h)
+    {
+      player_kill(&tux,KILL);
+    }
+}