a few fixes that I had lying around here, select walk animation in worldmap when...

[supertux.git] / src / object / player.cpp

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 566bcd8..1748059 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -36,11 +36,13 @@
 #include "game_session.hpp"
 #include "object/tilemap.hpp"
 #include "object/camera.hpp"
-#include "object/gameobjs.hpp"
+#include "object/particles.hpp"
 #include "object/portable.hpp"
+#include "object/bullet.hpp"
 #include "trigger/trigger_base.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "main.hpp"
+#include "badguy/badguy.hpp"
 #include "player_status.hpp"
 
 static const int TILES_FOR_BUTTJUMP = 3;
@@ -56,6 +58,8 @@ static const float MAX_WALK_XM = 230;
 static const float MAX_RUN_XM = 320;
 static const float WALK_SPEED = 100;
 
+static const float KICK_TIME = .3;
+
 // growing animation
 Surface* growingtux_left[GROWING_FRAMES];
 Surface* growingtux_right[GROWING_FRAMES];
@@ -153,19 +157,31 @@ Player::update(float elapsed_time)
     return;
   }
 
+  // fixes the "affected even while blinking" bug
+  if (safe_timer.started() && this->get_group() != COLGROUP_MOVING_ONLY_STATIC) {
+    this->set_group(COLGROUP_MOVING_ONLY_STATIC);
+  }
+  else if (!safe_timer.started() && this->get_group() == COLGROUP_MOVING_ONLY_STATIC) {
+    this->set_group(COLGROUP_MOVING);
+  }
+
   if(!controller->hold(Controller::ACTION) && grabbed_object) {
-    grabbed_object = 0;
     // move the grabbed object a bit away from tux
     Vector pos = get_pos() + 
-        Vector(dir == LEFT ? -bbox.get_width() : bbox.get_width(),
+        Vector(dir == LEFT ? -bbox.get_width()-1 : bbox.get_width()+1,
                 bbox.get_height()*0.66666 - 32);
-    MovingObject* object = dynamic_cast<MovingObject*> (grabbed_object);
-    if(object) {
-      object->set_pos(pos);
-    } else {
+    Rect dest(pos, pos + Vector(32, 32));
+    if(Sector::current()->is_free_space(dest)) {
+      MovingObject* moving_object = dynamic_cast<MovingObject*> (grabbed_object);
+      if(moving_object) {
+        moving_object->set_pos(pos);
+      } else {
 #ifdef DEBUG
-      std::cout << "Non MovingObjetc grabbed?!?\n";
+        std::cout << "Non MovingObjetc grabbed?!?\n";
 #endif
+      }
+      grabbed_object->ungrab(*this, dir);
+      grabbed_object = 0;
     }
   }
 
@@ -189,7 +205,7 @@ Player::update(float elapsed_time)
     Vector pos = get_pos() + 
       Vector(dir == LEFT ? -16 : 16,
              bbox.get_height()*0.66666 - 32);
-    grabbed_object->grab(*this, pos);
+    grabbed_object->grab(*this, pos, dir);
   }
 }
 
@@ -266,10 +282,9 @@ Player::handle_horizontal_input()
       // dust some particles
       Sector::current()->add_object(
         new Particles(
-          Vector(bbox.p1.x + (dir == RIGHT ? bbox.get_width() : 0),
-                 bbox.p2.y),
+          Vector(dir == RIGHT ? bbox.p2.x : bbox.p1.x, bbox.p2.y),
           dir == RIGHT ? 270+20 : 90-40, dir == RIGHT ? 270+40 : 90-20,
-          Vector(280,-260), Vector(0,0.030), 3, Color(100,100,100), 3, .8,
+          Vector(280, -260), Vector(0, 300), 3, Color(.4, .4, .4), 3, .8,
           LAYER_OBJECTS+1));
       
       ax *= 2.5;
@@ -473,21 +488,20 @@ Player::handle_input()
     bbox.move(Vector(0, 32));
     bbox.set_height(31.8);
   } else if(!controller->hold(Controller::DOWN) && is_big() && duck) {
-    // try if we can really unduck
+    // if we have some velocity left then check if there is space for
+    // unducking
     bbox.move(Vector(0, -32));
     bbox.set_height(63.8);
-    duck = false;
-    // FIXME
-#if 0
-    // when unducking in air we need some space to do so
-    if(on_ground() || !collision_object_map(bbox)) {
+    if(Sector::current()->is_free_space(bbox) || (
+        physic.get_velocity_x() > -.01 && physic.get_velocity_x() < .01
+        && physic.get_velocity_y() > -.01 && physic.get_velocity_y() < .01))
+    {
       duck = false;
     } else {
       // undo the ducking changes
       bbox.move(Vector(0, 32));
-      bbox.set_height(31.8);
+      bbox.set_height(31.8); 
     }
-#endif
   }
 }
 
@@ -508,6 +522,12 @@ Player::set_bonus(BonusType type, bool animate)
 }
 
 void
+Player::kick()
+{
+  kick_timer.start(KICK_TIME);
+}
+
+void
 Player::draw(DrawingContext& context)
 {
   TuxBodyParts* tux_body;
@@ -665,11 +685,18 @@ Player::collision_tile(uint32_t tile_attributes)
 HitResponse
 Player::collision(GameObject& other, const CollisionHit& hit)
 {
-  Portable* portable = dynamic_cast<Portable*> (&other);
-  if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
-     && fabsf(hit.normal.x) > .9) {
-    grabbed_object = portable;
-    return CONTINUE;
+  Bullet* bullet = dynamic_cast<Bullet*> (&other);
+  if(bullet) {
+    return FORCE_MOVE;
+  }
+
+  if(other.get_flags() & FLAG_PORTABLE) {
+    Portable* portable = dynamic_cast<Portable*> (&other);
+    if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
+        && fabsf(hit.normal.x) > .9) {
+      grabbed_object = portable;
+      return CONTINUE;
+    }
   }
  
   if(other.get_flags() & FLAG_SOLID) {
@@ -688,22 +715,25 @@ Player::collision(GameObject& other, const CollisionHit& hit)
     return CONTINUE;
   }
 
-  TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
-  if(trigger) {
-    if(controller->pressed(Controller::UP))
-      trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+#ifdef DEBUG
+  assert(dynamic_cast<MovingObject*> (&other) != NULL);
+#endif
+  MovingObject* moving_object = static_cast<MovingObject*> (&other); 
+  if(moving_object->get_group() == COLGROUP_TOUCHABLE) {
+    TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
+    if(trigger) {
+      if(controller->pressed(Controller::UP))
+        trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+    }
 
     return FORCE_MOVE;
   }
 
-  MovingObject* moving_object = static_cast<MovingObject*> (&other);
-  if(moving_object->get_group() == COLGROUP_TOUCHABLE)
-    return FORCE_MOVE;
-
-  if(is_invincible())
-    return FORCE_MOVE;
+  BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+  if(badguy != NULL)
+    return CONTINUE;
 
-  return CONTINUE;
+  return FORCE_MOVE;
 }
 
 void
@@ -722,7 +752,7 @@ Player::kill(HurtMode mode)
     return;
 
   if(mode != KILL && 
-          safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
+          (safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0))
     return;                          
   
   sound_manager->play("sounds/hurt.wav");
@@ -756,6 +786,11 @@ Player::kill(HurtMode mode)
       dying = true;
       dying_timer.start(3.0);
       set_group(COLGROUP_DISABLED);
+
+      DisplayEffect* effect = new DisplayEffect();
+      effect->fade_out(3.0);
+      Sector::current()->add_object(effect);
+      sound_manager->stop_music(3.0);
     }
 }