fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

[supertux.git] / src / badguy / mriceblock.cpp

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index 0dcd96e..18efa2f 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -20,8 +20,8 @@
 
 #include <config.h>
 
-#include "mriceblock.h"
-#include "object/block.h"
+#include "mriceblock.hpp"
+#include "object/block.hpp"
 
 static const float WALKSPEED = 80;
 static const float KICKSPEED = 500;
@@ -32,18 +32,21 @@ MrIceBlock::MrIceBlock(const lisp::Lisp& reader)
 {
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
+  stay_on_platform = false;
+  reader.get("stay-on-platform", stay_on_platform);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mriceblock");
+  sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
   set_direction = false;
 }
 
-MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d)
+MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d, bool stay_on_plat = false )
   : ice_state(ICESTATE_NORMAL), squishcount(0)
 {
   start_position.x = pos_x;
   start_position.y = pos_y;
+  stay_on_platform = stay_on_plat;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mriceblock");
+  sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -55,6 +58,7 @@ MrIceBlock::write(lisp::Writer& writer)
 
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
+  writer.write_bool("stay-on-platform", stay_on_platform);
 
   writer.end_list("mriceblock");
 }
@@ -62,7 +66,10 @@ MrIceBlock::write(lisp::Writer& writer)
 void
 MrIceBlock::activate()
 {
-  if (set_direction) {dir = initial_direction;}
+  if (set_direction) {
+    dir = initial_direction;
+  }
+
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
@@ -70,11 +77,22 @@ MrIceBlock::activate()
 void
 MrIceBlock::active_update(float elapsed_time)
 {
+  if(ice_state == ICESTATE_GRABBED)
+    return;
+
   if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
-    ice_state = ICESTATE_NORMAL;
-    physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+    set_state(ICESTATE_NORMAL);
+  }
+
+  if (ice_state == ICESTATE_NORMAL &&
+      stay_on_platform &&
+      may_fall_off_platform())
+  {
+    dir = (dir == LEFT ? RIGHT : LEFT);
     sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());
   }
+
   BadGuy::active_update(elapsed_time);
 }
 
@@ -105,18 +123,54 @@ MrIceBlock::collision_solid(GameObject& object, const CollisionHit& hit)
       dir = dir == LEFT ? RIGHT : LEFT;
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
       physic.set_velocity_x(-physic.get_velocity_x());
-      sound_manager->play("sounds/ricochet.wav", get_pos());
+      sound_manager->play("sounds/iceblock_bump.wav", get_pos());
       break;
     }
     case ICESTATE_FLAT:
       physic.set_velocity_x(0);
       break;
+    case ICESTATE_GRABBED:
+      return FORCE_MOVE;
   }
 
   return CONTINUE;
 }
 
 HitResponse
+MrIceBlock::collision(GameObject& object, const CollisionHit& hit)
+{
+  if(ice_state == ICESTATE_GRABBED)
+    return FORCE_MOVE;
+
+  return BadGuy::collision(object, hit);
+}
+
+HitResponse
+MrIceBlock::collision_player(Player& player, const CollisionHit& hit)
+{
+  if(ice_state == ICESTATE_GRABBED)
+    return FORCE_MOVE;
+
+  // handle kicks from left or right side
+  if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) {
+    // hit from left side
+    if(hit.normal.x > 0.7) {
+      dir = RIGHT;
+      player.kick();
+      set_state(ICESTATE_KICKED);
+      return FORCE_MOVE;
+    } else if(hit.normal.x < -0.7) {
+      dir = LEFT;
+      player.kick();
+      set_state(ICESTATE_KICKED);
+      return FORCE_MOVE;
+    }
+  }
+  
+  return BadGuy::collision_player(player, hit);
+}
+
+HitResponse
 MrIceBlock::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
 {
   switch(ice_state) {
@@ -151,32 +205,86 @@ MrIceBlock::collision_squished(Player& player)
         return true;
       }
 
-      // flatten
+      set_state(ICESTATE_FLAT);
+      break;
+    case ICESTATE_FLAT:
+      if(player.get_pos().x < get_pos().x) {
+        dir = RIGHT;
+      } else {
+        dir = LEFT;
+      }
+      set_state(ICESTATE_KICKED);
+      break;
+    case ICESTATE_GRABBED:
+      assert(false);
+      break;
+  }
+
+  player.bounce(*this);
+  return true;
+}
+
+void
+MrIceBlock::set_state(IceState state)
+{
+  if(ice_state == state)
+    return;
+  
+  if(state == ICESTATE_FLAT)
+    flags |= FLAG_PORTABLE;
+  else
+    flags &= ~FLAG_PORTABLE;
+
+  if(ice_state == ICESTATE_KICKED) {
+    bbox.set_size(31.8, 31.8);
+  }
+
+  switch(state) {
+    case ICESTATE_NORMAL:
+      physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+      sprite->set_action(dir == LEFT ? "left" : "right");
+      break;
+    case ICESTATE_FLAT:
       sound_manager->play("sounds/stomp.wav", get_pos());
       physic.set_velocity_x(0);
       physic.set_velocity_y(0); 
       
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
       flat_timer.start(4);
-      ice_state = ICESTATE_FLAT;
       break;
-    case ICESTATE_FLAT:
-      // kick
+    case ICESTATE_KICKED:
       sound_manager->play("sounds/kick.wav", get_pos());
 
-      if(player.get_pos().x < get_pos().x) {
-        dir = RIGHT;
-      } else {
-        dir = LEFT;
-      }
       physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
-      ice_state = ICESTATE_KICKED;
+      // we should slide above 1 block holes now...
+      bbox.set_size(34, 31.8);
       break;
+    case ICESTATE_GRABBED:
+      flat_timer.stop();
+      break;
+    default:
+      assert(false);
   }
+  ice_state = state;
+}
 
-  player.bounce(*this);
-  return true;
+void
+MrIceBlock::grab(MovingObject&, const Vector& pos, Direction dir)
+{
+  movement = pos - get_pos();
+  this->dir = dir;
+  sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+  set_state(ICESTATE_GRABBED);
+  set_group(COLGROUP_DISABLED);
+}
+
+void
+MrIceBlock::ungrab(MovingObject& , Direction dir)
+{
+  this->dir = dir;
+  set_state(ICESTATE_KICKED);
+  set_group(COLGROUP_MOVING);
 }
 
 IMPLEMENT_FACTORY(MrIceBlock, "mriceblock")