qmax patch to fix bug #0000389 - colors in infoblocks

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

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index cb801b3..0b9b9ce 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -25,6 +25,7 @@
 namespace {
   const float KICKSPEED = 500;
   const int MAXSQUISHES = 10;
+  const float NOKICK_TIME = 0.1f;
 }
 
 MrIceBlock::MrIceBlock(const lisp::Lisp& reader)
@@ -56,9 +57,9 @@ MrIceBlock::write(lisp::Writer& writer)
 }
 
 void
-MrIceBlock::activate()
+MrIceBlock::initialize()
 {
-  WalkingBadguy::activate();
+  WalkingBadguy::initialize();
   set_state(ICESTATE_NORMAL);
 }
 
@@ -182,25 +183,38 @@ MrIceBlock::collision_squished(GameObject& object)
 {
   switch(ice_state) {
     case ICESTATE_KICKED:
+      {
+        BadGuy* badguy = dynamic_cast<BadGuy*>(&object);
+        if (badguy) {
+          badguy->kill_fall();
+          break;
+        }
+      }
+
+      // fall through
     case ICESTATE_NORMAL:
-      squishcount++;
-      if(squishcount >= MAXSQUISHES) {
-        kill_fall();
-        return true;
+      {
+        Player* player = dynamic_cast<Player*>(&object);
+        squishcount++;
+        if ((squishcount >= MAXSQUISHES) || (player && player->does_buttjump)) {
+          kill_fall();
+          return true;
+        }
       }
 
       set_state(ICESTATE_FLAT);
+      nokick_timer.start(NOKICK_TIME);
       break;
     case ICESTATE_FLAT:
       {
-       MovingObject* movingobject = dynamic_cast<MovingObject*>(&object);
-       if (movingobject && (movingobject->get_pos().x < get_pos().x)) {
-         dir = RIGHT;
-       } else {
-         dir = LEFT;
-       }
+        MovingObject* movingobject = dynamic_cast<MovingObject*>(&object);
+        if (movingobject && (movingobject->get_pos().x < get_pos().x)) {
+          dir = RIGHT;
+        } else {
+          dir = LEFT;
+        }
       }
-      set_state(ICESTATE_KICKED);
+      if (nokick_timer.check()) set_state(ICESTATE_KICKED);
       break;
     case ICESTATE_GRABBED:
       assert(false);
@@ -220,7 +234,7 @@ MrIceBlock::set_state(IceState state)
 
   switch(state) {
     case ICESTATE_NORMAL:
-      WalkingBadguy::activate();
+      WalkingBadguy::initialize();
       break;
     case ICESTATE_FLAT:
       if(dir == UP) {
@@ -259,7 +273,7 @@ MrIceBlock::grab(MovingObject&, const Vector& pos, Direction dir)
   this->dir = dir;
   sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
   set_state(ICESTATE_GRABBED);
-  set_group(COLGROUP_DISABLED);
+  set_colgroup_active(COLGROUP_DISABLED);
 }
 
 void
@@ -267,7 +281,7 @@ MrIceBlock::ungrab(MovingObject& , Direction dir)
 {
   this->dir = dir;
   set_state(dir == UP ? ICESTATE_FLAT : ICESTATE_KICKED);
-  set_group(COLGROUP_MOVING);
+  set_colgroup_active(COLGROUP_MOVING);
 }
 
 bool