Tried fixing portability issue

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

diff --git a/src/object/block.cpp b/src/object/block.cpp
index 3ab0d1b..b9fae83 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -53,7 +53,6 @@ Block::Block(Sprite* newsprite)
 {
   bbox.set_size(32, 32.1);
   set_group(COLGROUP_STATIC);
-  flags |= FLAG_SOLID;
   sound_manager->preload("sounds/upgrade.wav");
   sound_manager->preload("sounds/brick.wav");
 }
@@ -64,12 +63,11 @@ Block::~Block()
 }
 
 HitResponse
-Block::collision(GameObject& other, const CollisionHit& hitdata)
+Block::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    // collided from below?
-    if(hitdata.normal.x == 0 && hitdata.normal.y < 0) {
+    if(player->get_bbox().get_top() > get_bbox().get_bottom() - 7.0) {
       hit(*player);
     }
   }
@@ -85,7 +83,7 @@ Block::collision(GameObject& other, const CollisionHit& hitdata)
     }
   }
 
-  return FORCE_MOVE;
+  return SOLID;
 }
 
 void
@@ -93,7 +91,7 @@ Block::update(float elapsed_time)
 {
   if(!bouncing)
     return;
-  
+
   float offset = original_y - get_pos().y;
   if(offset > BOUNCY_BRICK_MAX_OFFSET) {
     bounce_dir = BOUNCY_BRICK_SPEED;
@@ -139,7 +137,7 @@ BonusBlock::BonusBlock(const Vector& pos, int data)
       log_warning << "Invalid box contents" << std::endl;
       contents = CONTENT_COIN;
       break;
-  }          
+  }
 }
 
 BonusBlock::BonusBlock(const lisp::Lisp& lisp)
@@ -183,12 +181,12 @@ BonusBlock::BonusBlock(const lisp::Lisp& lisp)
       } else {
         log_warning << "Invalid element '" << token << "' in bonusblock" << std::endl;
       }
-    }  
+    }
   }
 
   if(contents == CONTENT_CUSTOM && object == 0)
     throw std::runtime_error("Need to specify content object for custom block");
-  
+
   bbox.set_pos(pos);
 }
 
@@ -203,6 +201,20 @@ BonusBlock::hit(Player& )
   try_open();
 }
 
+HitResponse
+BonusBlock::collision(GameObject& other, const CollisionHit& hit){
+    BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+    if(badguy) {
+      // hit contains no information for collisions with blocks.
+      // Badguy's bottom has to be below the top of the bonusblock
+      // +7 is required to slide over one tile gaps.
+      if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + 7.0) ){
+        try_open();
+      }
+    }
+    return Block::collision(other, hit);
+}
+
 void
 BonusBlock::try_open()
 {
@@ -210,9 +222,13 @@ BonusBlock::try_open()
     sound_manager->play("sounds/brick.wav");
     return;
   }
-  
+
   Sector* sector = Sector::current();
+  assert(sector);
+  assert(sector->player);
   Player& player = *(sector->player);
+  Direction direction = (player.get_bbox().get_middle().x > get_bbox().get_middle().x) ? LEFT : RIGHT;
+
   switch(contents) {
     case CONTENT_COIN:
       Sector::current()->add_object(new BouncyCoin(get_pos()));
@@ -221,11 +237,11 @@ BonusBlock::try_open()
 
     case CONTENT_FIREGROW:
       if(player.get_status()->bonus == NO_BONUS) {
-        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
+        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction));
         sector->add_object(riser);
       } else {
         SpecialRiser* riser = new SpecialRiser(
-            get_pos(), new Flower(Flower::FIREFLOWER));
+            get_pos(), new Flower(FIRE_BONUS));
         sector->add_object(riser);
       }
       sound_manager->play("sounds/upgrade.wav");
@@ -233,22 +249,22 @@ BonusBlock::try_open()
 
     case CONTENT_ICEGROW:
       if(player.get_status()->bonus == NO_BONUS) {
-        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
-        sector->add_object(riser);                                            
+        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp(direction));
+        sector->add_object(riser);
       } else {
         SpecialRiser* riser = new SpecialRiser(
-            get_pos(), new Flower(Flower::ICEFLOWER));
+            get_pos(), new Flower(ICE_BONUS));
         sector->add_object(riser);
-      }      
+      }
       sound_manager->play("sounds/upgrade.wav");
       break;
 
     case CONTENT_STAR:
-      sector->add_object(new Star(get_pos() + Vector(0, -32)));
+      sector->add_object(new Star(get_pos() + Vector(0, -32), direction));
       break;
 
     case CONTENT_1UP:
-      sector->add_object(new OneUp(get_pos()));
+      sector->add_object(new OneUp(get_pos(), direction));
       break;
 
     case CONTENT_CUSTOM:
@@ -257,9 +273,6 @@ BonusBlock::try_open()
       sector->add_object(riser);
       sound_manager->play("sounds/upgrade.wav");
       break;
-
-    //default:
-      //assert(false);
   }
 
   start_bounce();
@@ -286,16 +299,30 @@ Brick::hit(Player& )
 {
   if(sprite->get_action() == "empty")
     return;
-  
+
   try_break(true);
 }
 
+HitResponse
+Brick::collision(GameObject& other, const CollisionHit& hit){
+    BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+    if(badguy) {
+      // hit contains no information for collisions with blocks.
+      // Badguy's bottom has to be below the top of the brick
+      // +7 is required to slide over one tile gaps.
+      if( badguy->can_break() && ( badguy->get_bbox().get_bottom() > get_bbox().get_top() + 7.0 ) ){
+        try_break(false);
+      }
+    }
+   return Block::collision(other, hit);
+}
+
 void
 Brick::try_break(bool playerhit)
 {
   if(sprite->get_action() == "empty")
     return;
-  
+
   sound_manager->play("sounds/brick.wav");
   Sector* sector = Sector::current();
   Player& player = *(sector->player);
@@ -328,4 +355,3 @@ Brick::try_break(bool playerhit)
 }
 
 //IMPLEMENT_FACTORY(Brick, "brick");
-