Should fix arm crash.
[supertux.git] / src / player.cpp
index a049774..574c478 100644 (file)
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <math.h>
+#include <cmath>
 #include <iostream>
 #include <cassert>
+
 #include "gameloop.h"
-#include "globals.h"
+#include "app/globals.h"
 #include "player.h"
 #include "defines.h"
 #include "scene.h"
 #include "tile.h"
-#include "sprite.h"
+#include "special/sprite.h"
 #include "sector.h"
 #include "tilemap.h"
 #include "camera.h"
 #include "gameobjs.h"
 #include "resources.h"
 #include "interactive_object.h"
-#include "screen/screen.h"
+#include "video/screen.h"
 
 // behavior definitions:
 #define TILES_FOR_BUTTJUMP 3
 // animation times (in ms):
 #define SHOOTING_TIME 320
-#define STOMP_TIME 250
 // others stuff:
 #define AUTOSCROLL_DEAD_INTERVAL 300
 
@@ -53,10 +53,12 @@ Sprite* smalltux_gameover;
 Sprite* smalltux_star;
 Sprite* largetux_star;
 
-PlayerSprite smalltux;
-PlayerSprite largetux;
-PlayerSprite icetux;
-PlayerSprite firetux;
+Sprite* small_tux;
+Sprite* big_tux;
+Sprite* ice_tux;
+Sprite* fire_tux;
+
+Sprite* tux_arm;
 
 PlayerKeymap keymap;
 
@@ -116,7 +118,7 @@ Player::init()
   jumping = false;
   can_jump = true;
   butt_jump = false;
-
+  
   frame_main = 0;
   frame_ = 0;
 
@@ -225,7 +227,7 @@ Player::action(float elapsed_time)
   if(dying == DYING_NOT)
     handle_input();
 
-  physic.apply(elapsed_time, base.x, base.y);
+  physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
 
   if(dying == DYING_NOT) 
     {
@@ -288,7 +290,7 @@ Player::action(float elapsed_time)
           if (isbrick(base.x, base.y) ||
               isfullbox(base.x, base.y))
             {
-              Sector::current()->trygrabdistro(
+             Sector::current()->trygrabdistro(
                   Vector(base.x, base.y - 32), BOUNCE);
               Sector::current()->trybumpbadguy(Vector(base.x, base.y - 64));
 
@@ -302,7 +304,7 @@ Player::action(float elapsed_time)
           if (isbrick(base.x+ 31, base.y) ||
               isfullbox(base.x+ 31, base.y))
             {
-              Sector::current()->trygrabdistro(
+             Sector::current()->trygrabdistro(
                   Vector(base.x+ 31, base.y - 32), BOUNCE);
               Sector::current()->trybumpbadguy(Vector(base.x+ 31, base.y - 64));
 
@@ -417,7 +419,7 @@ Player::handle_horizontal_input()
   if(on_ground() && ((vx < 0 && dirsign >0) || (vx>0 && dirsign<0))) {
       if(fabs(vx)>SKID_XM && !skidding_timer.check()) {
           skidding_timer.start(SKID_TIME);
-          sound_manager->play_sound(sounds[SND_SKID]);
+          SoundManager::get()->play_sound(IDToSound(SND_SKID));
           ax *= 2.5;
       } else {
           ax *= 2;
@@ -484,9 +486,9 @@ Player::handle_vertical_input()
       jumping = true;
       can_jump = false;
       if (size == SMALL)
-        sound_manager->play_sound(sounds[SND_JUMP]);
+        SoundManager::get()->play_sound(IDToSound(SND_JUMP));
       else
-        sound_manager->play_sound(sounds[SND_BIGJUMP]);
+        SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
     }
   // Let go of jump key
   else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
@@ -508,7 +510,12 @@ Player::handle_vertical_input()
   // Do butt jump
   if (butt_jump && on_ground() && size == BIG)
   {
-    stomp_timer.start(STOMP_TIME);
+    // Add a smoke cloud
+    if (duck) 
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y));
+    else 
+      Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y + 32));
+    
     butt_jump = false;
 
     // Break bricks beneath Tux
@@ -651,7 +658,6 @@ Player::grabdistros()
     {
       Sector::current()->trygrabdistro(Vector(base.x, base.y), NO_BOUNCE);
       Sector::current()->trygrabdistro(Vector(base.x+ 31, base.y), NO_BOUNCE);
-
       Sector::current()->trygrabdistro(
           Vector(base.x, base.y + base.height), NO_BOUNCE);
       Sector::current()->trygrabdistro(
@@ -659,7 +665,7 @@ Player::grabdistros()
 
       if(size == BIG)
         {
-          Sector::current()->trygrabdistro(
+         Sector::current()->trygrabdistro(
               Vector(base.x, base.y + base.height / 2), NO_BOUNCE);
           Sector::current()->trygrabdistro(
               Vector(base.x+ 31, base.y + base.height / 2), NO_BOUNCE);
@@ -674,106 +680,119 @@ Player::grabdistros()
       if(player_status.lives < MAX_LIVES)
         ++player_status.lives;
       /*We want to hear the sound even, if MAX_LIVES is reached*/
-      sound_manager->play_sound(sounds[SND_LIFEUP]);
+      SoundManager::get()->play_sound(IDToSound(SND_LIFEUP));
     }
 }
 
 void
 Player::draw(DrawingContext& context)
 {
-  PlayerSprite* sprite;
+  Sprite* sprite;
           
   if (size == SMALL)
-    sprite = &smalltux;
+    sprite = small_tux;
   else if (got_power == FIRE_POWER)
-    sprite = &firetux;
+    sprite = fire_tux;
   else if (got_power == ICE_POWER)
-    sprite = &icetux;
+    sprite = ice_tux;
   else
-    sprite = &largetux;
+    sprite = big_tux;
 
   int layer = LAYER_OBJECTS - 1;
   Vector pos = Vector(base.x, base.y);
 
-  if (!safe_timer.started() || (global_frame_counter % 2) == 0)
+  if ((!safe_timer.started() || growing_timer.started()) || (global_frame_counter % 2) == 0)
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(context, pos, LAYER_OBJECTS+1);
+          smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1);
         }
       else
         {
           if(growing_timer.check())
             {
-              if (dir == RIGHT)
-                context.draw_surface(growingtux_right[(growing_timer.get_gone() * GROWING_FRAMES) / GROWING_TIME], pos, layer);
-              else 
-                context.draw_surface(growingtux_left[(growing_timer.get_gone() * GROWING_FRAMES) / GROWING_TIME], pos, layer);
+              if(size == SMALL)
+                {
+                if (dir == RIGHT)
+                  context.draw_surface(growingtux_right[GROWING_FRAMES-1 - 
+                          ((growing_timer.get_gone() *
+                          GROWING_FRAMES) / GROWING_TIME)], pos, layer);
+                else
+                  context.draw_surface(growingtux_left[GROWING_FRAMES-1 - 
+                          ((growing_timer.get_gone() *
+                          GROWING_FRAMES) / GROWING_TIME)], pos, layer);
+                }
+              else
+                {
+                if (dir == RIGHT)
+                  context.draw_surface(growingtux_right[(growing_timer.get_gone() *
+                          GROWING_FRAMES) / GROWING_TIME], pos, layer);
+                else
+                  context.draw_surface(growingtux_left[(growing_timer.get_gone() *
+                                       GROWING_FRAMES) / GROWING_TIME], pos, layer);
+                }
             }
           else if (duck && size != SMALL)
             {
               if (dir == RIGHT)
-                sprite->duck_right->draw(context, pos, layer);
+                sprite->set_action("duck-right");
               else 
-                sprite->duck_left->draw(context, pos, layer);
+                sprite->set_action("duck-left");
             }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)
-                sprite->skid_right->draw(context, pos, layer);
+                sprite->set_action("skid-right");
               else
-                sprite->skid_left->draw(context, pos, layer);
+                sprite->set_action("skid-left");
             }
           else if (kick_timer.started())
             {
               if (dir == RIGHT)
-                sprite->kick_right->draw(context, pos, layer);
+                sprite->set_action("kick-right");
               else
-                sprite->kick_left->draw(context, pos, layer);
+                sprite->set_action("kick-left");
             }
           else if (physic.get_velocity_y() != 0)
             {
               if (dir == RIGHT)
-                sprite->jump_right->draw(context, pos, layer);
+                sprite->set_action("jump-right");
               else
-                sprite->jump_left->draw(context, pos, layer);
+                sprite->set_action("jump-left");
             }
           else
             {
               if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
                   if (dir == RIGHT)
-                    sprite->stand_right->draw(context, pos, layer);
+                    sprite->set_action("stand-right");
                   else
-                    sprite->stand_left->draw(context, pos, layer);
+                    sprite->set_action("stand-left");
                 }
               else // moving
                 {
                   if (dir == RIGHT)
-                    sprite->walk_right->draw(context, pos, layer);
+                    sprite->set_action("walk-right");
                   else
-                    sprite->walk_left->draw(context, pos, layer);
+                    sprite->set_action("walk-left");
                 }
             }
         }
-    }     
+    }
+
+  if(dying != DYING_SQUISHED && !growing_timer.check())
+    sprite->draw(context, pos, layer);
 
   // Draw arm overlay graphics when Tux is holding something
   if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck)
   {
     if (dir == RIGHT)
-      sprite->grab_right->draw(context, pos, LAYER_OBJECTS + 1);
+      tux_arm->set_action("grab-right");
     else
-      sprite->grab_left->draw(context, pos, LAYER_OBJECTS + 1);
+      tux_arm->set_action("grab-left");
+    tux_arm->draw(context, pos, LAYER_OBJECTS + 1);
   }
   
-  // Draw stomp clouds when doing a butt jump
-  if (stomp_timer.check())
-    if (duck) 
-      sprite->stomp->draw(context, Vector(base.x - 32, base.y), LAYER_OBJECTS + 1);
-    else 
-      sprite->stomp->draw(context, Vector(base.x - 32, base.y + 32), LAYER_OBJECTS + 1);
-
   // Draw blinking star overlay
   if (invincible_timer.started() &&
       (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
@@ -919,7 +938,7 @@ Player::kill(HurtMode mode)
   if(dying)
     return;
   
-  sound_manager->play_sound(sounds[SND_HURT]);
+  SoundManager::get()->play_sound(IDToSound(SND_HURT));
 
   physic.set_velocity_x(0);
 
@@ -927,15 +946,17 @@ Player::kill(HurtMode mode)
     {
       if (got_power != NONE_POWER)
         {
+          safe_timer.start(TUX_SAFE_TIME);
           got_power = NONE_POWER;
         }
       else
         {
+          growing_timer.start(GROWING_TIME);
+          safe_timer.start(TUX_SAFE_TIME + GROWING_TIME);
           size = SMALL;
           base.height = 32;
           duck = false;
         }
-      safe_timer.start(TUX_SAFE_TIME);
     }
   else
     {
@@ -1002,3 +1023,18 @@ Player::check_bounds(Camera* camera)
   }
 }
 
+void
+Player::bounce(BadGuy* badguy)
+{
+  if (input.up)
+    physic.set_velocity_y(5.2);
+  else
+    physic.set_velocity_y(2);
+
+  // Move the player a little bit above the badguy to avoid collision
+  // between badguy and player directly after the bounce has happend
+  base.y = badguy->base.y - base.height - 2;
+}
+
+/* EOF */
+