X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=e0fd00397da602dd637d8753c7344221ef2f3dd8;hb=636db12f75b7130ec46d9be895c26eea1e1484ec;hp=cfffa8221b81e971707481f3233ce54fb5b71abc;hpb=aa5a16779bd88ee966db51e5b74b344de2ead375;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index cfffa8221..e0fd00397 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <math.h>
+#include <iostream>
+#include <cassert>
 #include "gameloop.h"
 #include "globals.h"
 #include "player.h"
@@ -37,6 +39,7 @@ Sprite* largetux_star;
 
 PlayerSprite smalltux;
 PlayerSprite largetux;
+PlayerSprite icetux;
 PlayerSprite firetux;
 
 PlayerKeymap keymap;
@@ -72,7 +75,7 @@ Player::init()
   base.height = 32;
 
   size = SMALL;
-  got_coffee = false;
+  got_power = NONE_POWER;
 
   base.x = plevel->start_pos_x;
   base.y = plevel->start_pos_y;
@@ -181,6 +184,14 @@ Player::action(double frame_ratio)
 
       collision_swept_object_map(&old_base, &base);
 
+      if (!invincible_timer.started()
+          && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y)
+          ||  isspike(base.x, base.y + base.height)
+          ||  isspike(base.x + base.width, base.y + base.height)))
+      {
+         kill(SHRINK);
+      }
+
       // Don't accelerate Tux if he is running against a wall
       if (target.x != base.x)
         {
@@ -453,7 +464,7 @@ Player::handle_input()
 
   /* Shoot! */
 
-  if (input.fire == DOWN && input.old_fire == UP && got_coffee)
+  if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
     {
       World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
       input.old_fire = DOWN;
@@ -551,7 +562,7 @@ Player::draw()
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(base.x - scroll_x, base.y);
+          smalltux_gameover->draw(base.x, base.y);
         }
       else
         {
@@ -559,54 +570,56 @@ Player::draw()
           
           if (size == SMALL)
             sprite = &smalltux;
-          else if (got_coffee)
+          else if (got_power == FIRE_POWER)
             sprite = &firetux;
+          else if (got_power == ICE_POWER)
+            sprite = &icetux;
           else
             sprite = &largetux;
           
           if (duck && size != SMALL)
             {
               if (dir == RIGHT)
-                sprite->duck_right->draw(base.x - scroll_x, base.y);
+                sprite->duck_right->draw(base.x, base.y);
               else 
-                sprite->duck_left->draw(base.x - scroll_x, base.y);
+                sprite->duck_left->draw(base.x, base.y);
             }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)
-                sprite->skid_right->draw(base.x - scroll_x, base.y);
+                sprite->skid_right->draw(base.x, base.y);
               else
-                sprite->skid_left->draw(base.x - scroll_x, base.y); 
+                sprite->skid_left->draw(base.x, base.y); 
             }
           else if (kick_timer.started())
             {
               if (dir == RIGHT)
-                sprite->kick_right->draw(base.x - scroll_x, base.y);
+                sprite->kick_right->draw(base.x, base.y);
               else
-                sprite->kick_left->draw(base.x - scroll_x, base.y); 
+                sprite->kick_left->draw(base.x, base.y); 
             }
           else if (physic.get_velocity_y() != 0)
             {
               if (dir == RIGHT)
-                sprite->jump_right->draw(base.x - scroll_x, base.y);
+                sprite->jump_right->draw(base.x, base.y);
               else
-                sprite->jump_left->draw(base.x - scroll_x, base.y);                   
+                sprite->jump_left->draw(base.x, base.y);                   
             }
           else
             {
               if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
                   if (dir == RIGHT)
-                    sprite->stand_right->draw( base.x - scroll_x, base.y);
+                    sprite->stand_right->draw( base.x, base.y);
                   else
-                    sprite->stand_left->draw( base.x - scroll_x, base.y);
+                    sprite->stand_left->draw( base.x, base.y);
                 }
               else // moving
                 {
                   if (dir == RIGHT)
-                    sprite->walk_right->draw(base.x - scroll_x, base.y);
+                    sprite->walk_right->draw(base.x, base.y);
                   else
-                    sprite->walk_left->draw(base.x - scroll_x, base.y);
+                    sprite->walk_left->draw(base.x, base.y);
                 }
             }
                       
@@ -614,9 +627,9 @@ Player::draw()
           if (holding_something && physic.get_velocity_y() == 0)
             {
               if (dir == RIGHT)
-                sprite->grab_right->draw(base.x - scroll_x, base.y);
+                sprite->grab_right->draw(base.x, base.y);
               else
-                sprite->grab_left->draw(base.x - scroll_x, base.y);
+                sprite->grab_left->draw(base.x, base.y);
             }
 
           // Draw blinking star overlay
@@ -624,15 +637,15 @@ Player::draw()
              (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
             {
               if (size == SMALL || duck)
-                smalltux_star->draw(base.x - scroll_x, base.y);
+                smalltux_star->draw(base.x, base.y);
               else
-                largetux_star->draw(base.x - scroll_x, base.y);
+                largetux_star->draw(base.x, base.y);
             }
         }
     }     
   
   if (debug_mode)
-    fillrect(base.x - scroll_x, base.y, 
+    fillrect(base.x - scroll_x, base.y - scroll_y, 
              base.width, base.height, 75,75,75, 150);
 }
 
@@ -640,6 +653,7 @@ void
 Player::collision(void* p_c_object, int c_object)
 {
   BadGuy* pbad_c = NULL;
+  Trampoline* ptramp_c = NULL;
 
   switch (c_object)
     {
@@ -670,14 +684,12 @@ Player::collision(void* p_c_object, int c_object)
                   kill(SHRINK);
                 }
               else
-                {
-                   pbad_c->dying = DYING_FALLING;
-                   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                   World::current()->add_score(pbad_c->base.x - scroll_x,
-                                               pbad_c->base.y,
-                                               25 * player_status.score_multiplier);
-                }
+                pbad_c->kill_me(20);
             }
+          else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB
+              || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH
+              || pbad_c->kind == BAD_SPIKY))
+                pbad_c->kill_me(20);
           else
             {
               if (!invincible_timer.started())
@@ -692,6 +704,49 @@ Player::collision(void* p_c_object, int c_object)
           player_status.score_multiplier++;
         }
       break;
+
+    case CO_TRAMPOLINE:
+      ptramp_c = (Trampoline*) p_c_object;
+      
+      // Pick up trampoline
+      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something && on_ground())
+      {
+        holding_something = true;
+        ptramp_c->mode = Trampoline::M_HELD;
+        ptramp_c->base.y -= 8;
+      }
+      // Set down trampoline
+      else if (ptramp_c->mode == Trampoline::M_HELD && input.fire != DOWN)
+      {
+        holding_something = false;
+        ptramp_c->mode = Trampoline::M_NORMAL;
+        ptramp_c->base.y += 8;
+        ptramp_c->physic.set_velocity(physic.get_velocity_x(), physic.get_velocity_y());
+
+        //if (dir == RIGHT)
+        //  ptramp_c->base.x = base.x + base.width+1;
+        //else /* LEFT */
+        //  ptramp_c->base.x = base.x - base.width-1;
+      }
+/*
+      // Don't let tux walk through trampoline
+      else if (ptramp_c->mode != Trampoline::M_HELD && on_ground())
+      {
+        if (physic.get_velocity_x() > 0) // RIGHT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x - base.width;
+        }
+        else if (physic.get_velocity_x() < 0) // LEFT
+        {
+          physic.set_velocity_x(0);
+          base.x = ptramp_c->base.x + ptramp_c->base.width;
+        }
+      }
+*/
+
+      break;
+
     default:
       break;
     }
@@ -709,9 +764,9 @@ Player::kill(HurtMode mode)
 
   if (mode == SHRINK && size == BIG)
     {
-      if (got_coffee)
+      if (got_power != NONE_POWER)
         {
-          got_coffee = false;
+          got_power = NONE_POWER;
         }
       else
         {
@@ -741,7 +796,8 @@ Player::is_dying()
 
 bool Player::is_dead()
 {
-  if(base.y > screen->h || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
+  if(base.y > screen->h + scroll_y ||
+      base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // can happen in auto-scrolling
     return true;
   else
     return false;
@@ -751,7 +807,7 @@ bool Player::is_dead()
 void
 Player::remove_powerups()
 {
-  got_coffee = false;
+  got_power = NONE_POWER;
   size = SMALL;
   base.height = 32;
 }
@@ -767,7 +823,7 @@ Player::check_bounds(bool back_scrolling, bool hor_autoscroll)
     }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > screen->h)
+  if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
     {
       kill(KILL);
     }