X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fblock.cpp;h=fd6e2fc211308b5188723058b91fdbf49ac3129a;hb=fea3446f05e1e7673607b835c269d3e8d1929ab3;hp=4bd14094bdc59998b5c6ddc066bc0fd043f571c3;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/object/block.cpp b/src/object/block.cpp
index 4bd14094b..fd6e2fc21 100644
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -32,6 +32,7 @@
 #include "video/drawing_context.hpp"
 #include "lisp/lisp.hpp"
 #include "gameobjs.hpp"
+#include "portable.hpp"
 #include "specialriser.hpp"
 #include "growup.hpp"
 #include "flower.hpp"
@@ -43,17 +44,17 @@
 #include "object_factory.hpp"
 #include "lisp/list_iterator.hpp"
 #include "object_factory.hpp"
+#include "level.hpp"
 
-static const float BOUNCY_BRICK_MAX_OFFSET=8;
-static const float BOUNCY_BRICK_SPEED=90;
-static const float EPSILON = .0001;
+static const float BOUNCY_BRICK_MAX_OFFSET = 8;
+static const float BOUNCY_BRICK_SPEED = 90;
+static const float EPSILON = .0001f;
 
 Block::Block(Sprite* newsprite)
-  : sprite(newsprite), bouncing(false), bounce_dir(0), bounce_offset(0)
+  : sprite(newsprite), bouncing(false), breaking(false), bounce_dir(0), bounce_offset(0)
 {
-  bbox.set_size(32, 32.1);
+  bbox.set_size(32, 32.1f);
   set_group(COLGROUP_STATIC);
-  flags |= FLAG_SOLID;
   sound_manager->preload("sounds/upgrade.wav");
   sound_manager->preload("sounds/brick.wav");
 }
@@ -73,15 +74,25 @@ Block::collision(GameObject& other, const CollisionHit& )
     }
   }
 
-  if(bouncing) {
+  // only interact with other objects if...
+  //   1) we are bouncing
+  // and
+  //   2) the object is not portable (either never or not currently)
+  Portable* portable = dynamic_cast<Portable*> (&other);
+  if(bouncing && (portable == 0 || (!portable->is_portable()))) {
+
+    // Badguys get killed
     BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
     if(badguy) {
       badguy->kill_fall();
     }
+
+    // Coins get collected
     Coin* coin = dynamic_cast<Coin*> (&other);
     if(coin) {
       coin->collect();
     }
+
   }
 
   return SOLID;
@@ -97,6 +108,9 @@ Block::update(float elapsed_time)
   if(offset > BOUNCY_BRICK_MAX_OFFSET) {
     bounce_dir = BOUNCY_BRICK_SPEED;
     movement = Vector(0, bounce_dir * elapsed_time);
+    if(breaking){
+      break_me();
+    }
   } else if(offset < BOUNCY_BRICK_SPEED * elapsed_time && bounce_dir > 0) {
     movement = Vector(0, offset);
     bounce_dir = 0;
@@ -121,6 +135,13 @@ Block::start_bounce()
   bounce_offset = 0;
 }
 
+void
+Block::start_break()
+{
+  start_bounce();
+  breaking = true;
+}
+
 //---------------------------------------------------------------------------
 
 BonusBlock::BonusBlock(const Vector& pos, int data)
@@ -213,6 +234,13 @@ BonusBlock::collision(GameObject& other, const CollisionHit& hit){
         try_open();
       }
     }
+    Portable* portable = dynamic_cast<Portable*> (&other);
+    if(portable) {
+      MovingObject* moving = dynamic_cast<MovingObject*> (&other);
+      if(moving->get_bbox().get_top() > get_bbox().get_bottom() - 7.0) {
+        try_open();
+      }
+    }
     return Block::collision(other, hit);
 }
 
@@ -234,6 +262,7 @@ BonusBlock::try_open()
     case CONTENT_COIN:
       Sector::current()->add_object(new BouncyCoin(get_pos()));
       player.get_status()->add_coins(1);
+      Sector::current()->get_level()->stats.coins++;
       break;
 
     case CONTENT_FIREGROW:
@@ -280,6 +309,24 @@ BonusBlock::try_open()
   sprite->set_action("empty");
 }
 
+void
+Block::break_me()
+{
+  Sector* sector = Sector::current();
+  sector->add_object(
+      new BrokenBrick(new Sprite(*sprite), get_pos(), Vector(-100, -400)));
+  sector->add_object(
+      new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(0, 16),
+        Vector(-150, -300)));
+  sector->add_object(
+      new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 0),
+        Vector(100, -400)));
+  sector->add_object(
+      new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 16),
+        Vector(150, -300)));
+  remove_me();
+}
+
 IMPLEMENT_FACTORY(BonusBlock, "bonusblock");
 
 //---------------------------------------------------------------------------
@@ -315,6 +362,13 @@ Brick::collision(GameObject& other, const CollisionHit& hit){
         try_break(false);
       }
     }
+    Portable* portable = dynamic_cast<Portable*> (&other);
+    if(portable) {
+      MovingObject* moving = dynamic_cast<MovingObject*> (&other);
+      if(moving->get_bbox().get_top() > get_bbox().get_bottom() - 7.0) {
+        try_break();
+      }
+    }
    return Block::collision(other, hit);
 }
 
@@ -335,23 +389,16 @@ Brick::try_break(bool playerhit)
       sprite->set_action("empty");
     start_bounce();
   } else if(breakable) {
-    if(playerhit && !player.is_big()) {
-      start_bounce();
-      return;
+    if(playerhit){
+      if(player.is_big()){
+        start_break();
+        return;
+      } else {
+        start_bounce();
+        return;
+      }
     }
-
-    sector->add_object(
-        new BrokenBrick(new Sprite(*sprite), get_pos(), Vector(-100, -400)));
-    sector->add_object(
-        new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(0, 16),
-          Vector(-150, -300)));
-    sector->add_object(
-        new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 0),
-          Vector(100, -400)));
-    sector->add_object(
-        new BrokenBrick(new Sprite(*sprite), get_pos() + Vector(16, 16),
-          Vector(150, -300)));
-    remove_me();
+   break_me();
   }
 }