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

diff --git a/src/player.c b/src/player.c
index ce4ee5c57..8b567cb72 100644
--- a/src/player.c
+++ b/src/player.c
@@ -4,7 +4,7 @@
 // Description:
 //
 //
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
+// Author: Tobias Glaesser <tobi.web@gmx.de> & Bill Kendrick, (C) 2004
 //
 // Copyright: See COPYING file that comes with this distribution
 //
@@ -17,12 +17,25 @@
 #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;
   pplayer->base.height = 32;
 
-  pplayer->base.updated = SDL_GetTicks();
   pplayer->size = SMALL;
   pplayer->got_coffee = NO;
 
@@ -39,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,72 +67,44 @@ void player_init(player_type* pplayer)
   pplayer->keymap.left = SDLK_LEFT;
   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;
-              return YES;
-	    }
-            else if( key == pplayer->keymap.left)
-	    {
-              pplayer->input.left = UP;
-              return YES;
-	    }
-            else if(key == pplayer->keymap.jump)
-	    {
-              pplayer->input.up = UP;
-              return YES;
-	    }
-            else if(key == pplayer->keymap.duck)
-	    {
-              pplayer->input.down = UP;
-              return YES;
-            }
-	    else if(key == pplayer->keymap.fire)
-	    {
-              pplayer->input.fire = UP;
-              return YES;
-	    }
-	    else
-	    return NO;
+  if(key == pplayer->keymap.right)
+    {
+      pplayer->input.right = state;
+      return YES;
+    }
+  else if( key == pplayer->keymap.left)
+    {
+      pplayer->input.left = state;
+      return YES;
+    }
+  else if(key == pplayer->keymap.jump)
+    {
+      pplayer->input.up = state;
+      return YES;
+    }
+  else if(key == pplayer->keymap.duck)
+    {
+      pplayer->input.down = state;
+      return YES;
+    }
+  else if(key == pplayer->keymap.fire)
+    {
+      pplayer->input.fire = state;
+      return YES;
+    }
+  else
+    return NO;
 }
 
 void player_level_begin(player_type* pplayer)
@@ -126,7 +113,7 @@ void player_level_begin(player_type* pplayer)
   pplayer->base.y = 240;
   pplayer->base.xm = 0;
   pplayer->base.ym = 0;
-  
+
   pplayer->input.down = UP;
   pplayer->input.fire = UP;
   pplayer->input.left = UP;
@@ -134,21 +121,24 @@ 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)
 {
-
-  double frame_ratio = get_frame_ratio(&pplayer->base);
-
   /* --- HANDLE TUX! --- */
 
   player_input(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);
 
@@ -156,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);
         }
 
-      if (issolid(pplayer->base.x, pplayer->base.y) &&
+      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++;
+                }
+            }
+        }
+
+      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)))
@@ -182,19 +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!");
-		
+                {
+                  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)
@@ -204,203 +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;
         }
 
+      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;
+        }
 
-      /* Bump into things: */
+          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');
+
+          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 + scroll_x, 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)
@@ -408,236 +614,296 @@ 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: */
+              /* 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: */
-
-              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);
-    
+
 
   /* ---- DONE HANDLING TUX! --- */
 
   /* Handle invincibility timer: */
 
 
-  if (timer_check(&pplayer->invincible_timer))
+  if (current_music == HERRING_MUSIC && !timer_check(&pplayer->invincible_timer))
     {
-      if (current_music == HERRING_MUSIC)
+      /*
+         no, we are no more invincible
+         or we were not in invincible mode
+         but are we in hurry ?
+       */
+
+
+      if (timer_get_left(&time_left) < TIME_WARNING)
         {
-          if (current_level.time_left <= TIME_WARNING)
-            {
-              /* stop the herring_song, prepare to play the correct
-               * fast level_song !
-               */
-              current_music = HURRYUP_MUSIC;
-            }
-          else
-            {
-              current_music = LEVEL_MUSIC;
-            }
-          /* stop the old music if it's being played */
-          if (playing_music())
-            halt_music();
+          /* yes, we are in hurry
+             stop the herring_song, prepare to play the correct
+             fast level_song !
+           */
+          current_music = HURRYUP_MUSIC;
+        }
+      else
+        {
+          current_music = LEVEL_MUSIC;
         }
+
+      /* stop the old music if it's being played */
+      if (playing_music())
+        halt_music();
     }
 
   /* Handle skidding: */
 
   timer_check(&pplayer->skidding_timer);
-  
+
   /* End of level? */
 
-  if (pplayer->base.x>= endpos && endpos != 0)
+  if (pplayer->base.x - scroll_x >= endpos && endpos != 0)
     {
       next_level = 1;
     }
 
 }
 
-void player_input(player_type *pplayer)
+int player_on_ground(player_type *pplayer)
 {
-  /* Handle key and joystick state: */
-
+  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;
+    }
+}
 
-  if (pplayer->input.right == DOWN && pplayer->input.left == UP)
+void player_handle_horizontal_input(player_type *pplayer, int dir)
+{
+  if (pplayer->jumping == NO)
     {
-      if (pplayer->jumping == NO)
+      if ((dir ? (pplayer->base.xm < -SKID_XM) : (pplayer->base.xm > SKID_XM)) && !timer_started(&pplayer->skidding_timer) &&
+          pplayer->dir == !dir)
         {
-          if (pplayer->base.xm < -SKID_XM && !timer_started(&pplayer->skidding_timer) &&
-              pplayer->dir == LEFT)
-            {
-              timer_start(&pplayer->skidding_timer, SKID_TIME);
+          timer_start(&pplayer->skidding_timer, SKID_TIME);
 
-              play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
+          play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
 
-            }
-          pplayer->dir = RIGHT;
         }
+      pplayer->dir = dir;
+    }
 
-      if (pplayer->base.xm < 0 && !isice(pplayer->base.x, pplayer->base.y + 32) &&
-          !timer_started(&pplayer->skidding_timer))
-        {
-          pplayer->base.xm = 0;
-        }
+  if ((dir ? (pplayer->base.xm < 0) : (pplayer->base.xm > 0)) && !isice(pplayer->base.x, pplayer->base.y + 32) &&
+      !timer_started(&pplayer->skidding_timer))
+    {
+      pplayer->base.xm = 0;
+    }
 
-      if (!pplayer->duck)
+  if (!pplayer->duck)
+    {
+      if (pplayer->dir == dir)
         {
-          if (pplayer->dir == RIGHT)
+          /* Facing the direction we're jumping?  Go full-speed: */
+
+          if (pplayer->input.fire == UP)
             {
-              /* Facing the direction we're jumping?  Go full-speed: */
+              pplayer->base.xm = pplayer->base.xm + ( dir ? WALK_SPEED : -WALK_SPEED) * frame_ratio;
 
-              if (pplayer->input.fire == UP)
+              if(dir)
                 {
-                  pplayer->base.xm = pplayer->base.xm + WALK_SPEED;
-
                   if (pplayer->base.xm > MAX_WALK_XM)
                     pplayer->base.xm = MAX_WALK_XM;
                 }
-              else if ( pplayer->input.fire == DOWN)
+              else
                 {
-                  pplayer->base.xm = pplayer->base.xm + RUN_SPEED;
+                  if (pplayer->base.xm < -MAX_WALK_XM)
+                    pplayer->base.xm = -MAX_WALK_XM;
+                }
+            }
+          else if ( pplayer->input.fire == DOWN)
+            {
+              pplayer->base.xm = pplayer->base.xm + ( dir ? RUN_SPEED : -RUN_SPEED) * frame_ratio;
 
+              if(dir)
+                {
                   if (pplayer->base.xm > MAX_RUN_XM)
                     pplayer->base.xm = MAX_RUN_XM;
                 }
+              else
+                {
+                  if (pplayer->base.xm < -MAX_RUN_XM)
+                    pplayer->base.xm = -MAX_RUN_XM;
+                }
             }
           else
             {
               /* Not facing the direction we're jumping?
               Go half-speed: */
 
-              pplayer->base.xm = pplayer->base.xm + WALK_SPEED / 2;
+              pplayer->base.xm = pplayer->base.xm + ( dir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio;
 
-              if (pplayer->base.xm > MAX_WALK_XM / 2)
-                pplayer->base.xm = MAX_WALK_XM / 2;
+              if(dir)
+                {
+                  if (pplayer->base.xm > MAX_WALK_XM / 2)
+                    pplayer->base.xm = MAX_WALK_XM / 2;
+                }
+              else
+                {
+                  if (pplayer->base.xm < -MAX_WALK_XM / 2)
+                    pplayer->base.xm = -MAX_WALK_XM / 2;
+                }
             }
         }
+
     }
-  else if (pplayer->input.left == DOWN && pplayer->input.right == UP)
+}
+
+void player_handle_vertical_input(player_type *pplayer)
+{
+  if(pplayer->input.up == DOWN)
     {
-      if (pplayer->jumping == NO)
+      if (player_on_ground(pplayer))
         {
-          if (pplayer->base.xm > SKID_XM && !timer_started(&pplayer->skidding_timer) &&
-              pplayer->dir == RIGHT)
+          if(!physic_is_set(&pplayer->vphysic))
             {
-              timer_start(&pplayer->skidding_timer,SKID_TIME);
-              play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER);
+              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);
             }
-          pplayer->dir = LEFT;
         }
-
-      if (pplayer->base.xm > 0 && !isice(pplayer->base.x, pplayer->base.y + 32) &&
-          !timer_started(&pplayer->skidding_timer))
+    }
+  else if(pplayer->input.up == UP && pplayer->jumping == YES)
+    {
+      if (issolid(pplayer->base.x + 16, pplayer->base.y + pplayer->base.height + 1))
         {
-          pplayer->base.xm = 0;
+          physic_init(&pplayer->vphysic);
+          pplayer->jumping == NO;
         }
-
-      if (!pplayer->duck)
+      else
         {
-          if (pplayer->dir == LEFT)
+          pplayer->jumping = NO;
+          if(physic_is_set(&pplayer->vphysic))
             {
-              /* Facing the direction we're jumping?  Go full-speed: */
-
-              if (pplayer->input.fire == UP)
+              if(physic_get_velocity(&pplayer->vphysic) < 0.)
                 {
-                  pplayer->base.xm = pplayer->base.xm - WALK_SPEED;
-
-                  if (pplayer->base.xm < -MAX_WALK_XM)
-                    pplayer->base.xm = -MAX_WALK_XM;
-                }
-              else if (pplayer->input.fire == DOWN)
-                {
-                  pplayer->base.xm = pplayer->base.xm - RUN_SPEED;
-
-                  if (pplayer->base.xm < -MAX_RUN_XM)
-                    pplayer->base.xm = -MAX_RUN_XM;
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                  physic_set_start_vy(&pplayer->vphysic,0);
                 }
             }
           else
             {
-              /* Not facing the direction we're jumping?
-              Go half-speed: */
-
-              pplayer->base.xm = pplayer->base.xm - WALK_SPEED / 2;
-
-              if (pplayer->base.xm < -MAX_WALK_XM / 2)
-                pplayer->base.xm = -MAX_WALK_XM / 2;
+              if(!physic_is_set(&pplayer->vphysic))
+                {
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                }
             }
         }
     }
 
-  /* Jump/jumping? */
+  /* Taking off? * /
 
-  if ( pplayer->input.up == DOWN)
+  if (!issolid(pplayer->base.x, pplayer->base.y + 32) ||
+      pplayer->base.ym != 0)
     {
-      if(!timer_started(&pplayer->jump_timer))
-        {
-          timer_start(&pplayer->jump_timer,MAX_JUMP_TIME);
+      /* 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! * /
 
-          /* 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! */
+      if (pplayer->size == SMALL || pplayer->duck == NO ||
+          !issolid(pplayer->base.x, pplayer->base.y))
+        {
+          pplayer->jumping = YES;
 
-              pplayer->jumping = NO;
-              timer_stop(&pplayer->jump_timer);
-            }
+          if (pplayer->size == SMALL)
+            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
           else
-            {
-              /* Make sure we're not standing back up into a solid! */
+            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
+        }
+    }*/
 
-              if (pplayer->size == SMALL || pplayer->duck == NO ||
-                  !issolid(pplayer->base.x, pplayer->base.y))
-                {
-                  pplayer->jumping = YES;
+  /* Keep jumping for a while: * /
 
-                  if (pplayer->size == SMALL)
-                    play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
-                  else
-                    play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
-                }
-            }
-        }
+  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* /;
+    }*/
+}
 
-      /* Keep jumping for a while: */
+void player_input(player_type *pplayer)
+{
+  /* Handle key and joystick state: */
 
-      if (timer_check(&pplayer->jump_timer))
+
+  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.ym = pplayer->base.ym - JUMP_SPEED;
+          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;
         }
     }
-  else
-    timer_stop(&pplayer->jump_timer);
 
+  /* Jump/jumping? */
+
+  if ( pplayer->input.up == DOWN || (pplayer->input.up == UP && pplayer->jumping == YES))
+    {
+      player_handle_vertical_input(pplayer);
+    }
 
   /* Shoot! */
 
@@ -660,7 +926,7 @@ void player_input(player_type *pplayer)
         {
           /* Make sure we're not standing back up into a solid! */
 
-          if (!issolid(pplayer->base.x, pplayer->base.y - 32))
+          if (!issolid(pplayer->base.x + 16, pplayer->base.y - 16))
             pplayer->duck = NO;
         }
       else
@@ -669,21 +935,25 @@ void player_input(player_type *pplayer)
 
   /* (Tux): */
 
-  if (pplayer->input.right == UP && pplayer->input.left == UP)
-    {
-      pplayer->frame_main = 1;
-      pplayer->frame = 1;
-    }
-  else
+  if(!timer_check(&pplayer->frame_timer))
     {
-      if ((pplayer->input.fire == DOWN && (frame % 2) == 0) ||
-          (frame % 4) == 0)
-        pplayer->frame_main = (pplayer->frame_main + 1) % 4;
+      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;
+          pplayer->frame = pplayer->frame_main;
 
-      if (pplayer->frame == 3)
-        pplayer->frame = 1;
+          if (pplayer->frame == 3)
+            pplayer->frame = 1;
+        }
     }
 
 }
@@ -696,11 +966,15 @@ void player_grabdistros(player_type *pplayer)
       trygrabdistro(pplayer->base.x, pplayer->base.y, NO_BOUNCE);
       trygrabdistro(pplayer->base.x+ 31, pplayer->base.y, NO_BOUNCE);
 
-      if (pplayer->size == BIG && !pplayer->duck)
+      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(pplayer->size == BIG)
         {
-          trygrabdistro(pplayer->base.x, pplayer->base.y - 32, NO_BOUNCE);
-          trygrabdistro(pplayer->base.x+ 31, pplayer->base.y - 32, NO_BOUNCE);
+          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);
         }
+
     }
 
 
@@ -718,7 +992,6 @@ void player_grabdistros(player_type *pplayer)
 
 void player_draw(player_type* pplayer)
 {
-
   if (!timer_started(&pplayer->safe_timer) || (frame % 2) == 0)
     {
       if (pplayer->size == SMALL)
@@ -776,13 +1049,13 @@ void player_draw(player_type* pplayer)
               if (pplayer->dir == RIGHT)
                 {
                   texture_draw(&bigcape_right[frame % 2],
-                               pplayer->base.x- scroll_x - 8 - 16, pplayer->base.y - 32,
+                               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 - 32,
+                               pplayer->base.x-scroll_x - 8, pplayer->base.y,
                                NO_UPDATE);
                 }
             }
@@ -798,13 +1071,13 @@ void player_draw(player_type* pplayer)
                           if (pplayer->dir == RIGHT)
                             {
                               texture_draw(&bigtux_right[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                           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 - 32,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                            NO_UPDATE);
                             }
                         }
@@ -813,13 +1086,13 @@ void player_draw(player_type* pplayer)
                           if (pplayer->dir == RIGHT)
                             {
                               texture_draw(&bigtux_right_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                           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 - 32,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                            NO_UPDATE);
                             }
                         }
@@ -829,13 +1102,13 @@ void player_draw(player_type* pplayer)
                       if (pplayer->dir == RIGHT)
                         {
                           texture_draw(&skidtux_right,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                       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 - 32,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                        NO_UPDATE);
                         }
                     }
@@ -844,12 +1117,12 @@ void player_draw(player_type* pplayer)
                 {
                   if (pplayer->dir == RIGHT)
                     {
-                      texture_draw(&ducktux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
+                      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 - 16,
+                      texture_draw(&ducktux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                    NO_UPDATE);
                     }
                 }
@@ -867,13 +1140,13 @@ void player_draw(player_type* pplayer)
                           if (pplayer->dir == RIGHT)
                             {
                               texture_draw(&bigfiretux_right[pplayer->frame],
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                           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 - 32,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                            NO_UPDATE);
                             }
                         }
@@ -882,13 +1155,13 @@ void player_draw(player_type* pplayer)
                           if (pplayer->dir == RIGHT)
                             {
                               texture_draw(&bigfiretux_right_jump,
-                                           pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                           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 - 32,
+                                           pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                            NO_UPDATE);
                             }
                         }
@@ -898,13 +1171,13 @@ void player_draw(player_type* pplayer)
                       if (pplayer->dir == RIGHT)
                         {
                           texture_draw(&skidfiretux_right,
-                                       pplayer->base.x- scroll_x - 8, pplayer->base.y - 32,
+                                       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 - 32,
+                                       pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                        NO_UPDATE);
                         }
                     }
@@ -913,19 +1186,18 @@ void player_draw(player_type* pplayer)
                 {
                   if (pplayer->dir == RIGHT)
                     {
-                      texture_draw(&duckfiretux_right, pplayer->base.x- scroll_x - 8, pplayer->base.y - 16,
+                      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 - 16,
+                      texture_draw(&duckfiretux_left, pplayer->base.x- scroll_x - 8, pplayer->base.y,
                                    NO_UPDATE);
                     }
                 }
             }
         }
     }
-
 }
 
 void player_collision(player_type* pplayer, void* p_c_object, int c_object)
@@ -935,7 +1207,7 @@ void player_collision(player_type* pplayer, void* p_c_object, int c_object)
   switch (c_object)
     {
     case CO_BADGUY:
-      pbad_c = p_c_object;
+      pbad_c = (bad_guy_type*) p_c_object;
       /* Hurt the player if he just touched it: */
 
       if (!pbad_c->dying && !pplayer->dying &&
@@ -991,7 +1263,8 @@ void player_collision(player_type* pplayer, void* p_c_object, int c_object)
                       else
                         {
                           pbad_c->dying = FALLING;
-                          pbad_c->base.ym = -8;
+                          physic_set_state(&pplayer->vphysic,PH_VT);
+                          physic_set_start_vy(&pplayer->vphysic,-2.);
                           play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
                         }
                     }
@@ -1006,12 +1279,15 @@ void player_collision(player_type* pplayer, void* p_c_object, int c_object)
               else
                 {
                   pbad_c->dying = FALLING;
-                  pbad_c->base.ym = -8;
+                  physic_set_state(&pplayer->vphysic,PH_VT);
+                  physic_set_start_vy(&pplayer->vphysic,-2.);
                   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
                 }
             }
+          score_multiplier++;
         }
-      score_multiplier++;
+      break;
+    default:
       break;
     }
 
@@ -1027,7 +1303,7 @@ void player_kill(player_type* pplayer, int mode)
 
   if (pplayer->dir == RIGHT)
     pplayer->base.xm = -8;
-  else if (tux.dir == LEFT)
+  else if (pplayer->dir == LEFT)
     pplayer->base.xm = 8;
 
   if (mode == SHRINK && pplayer->size == BIG)
@@ -1036,6 +1312,7 @@ void player_kill(player_type* pplayer, int mode)
         pplayer->got_coffee = NO;
 
       pplayer->size = SMALL;
+      pplayer->base.height = 32;
 
       timer_start(&pplayer->safe_timer,TUX_SAFE_TIME);
     }
@@ -1047,14 +1324,14 @@ void player_kill(player_type* pplayer, int mode)
 
 void player_dying(player_type *pplayer)
 {
-  pplayer->base.ym = pplayer->base.ym + GRAVITY;
+  pplayer->base.ym = pplayer->base.ym + gravity;
 
   /* He died :^( */
 
   --pplayer->lives;
   player_remove_powerups(pplayer);
   pplayer->dying = NO;
-  
+
   player_level_begin(pplayer);
 
 }
@@ -1064,6 +1341,7 @@ 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)