Tentative checkin of tuxdev's "Object improvement patch, part 1"

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

diff --git a/src/object/weak_block.cpp b/src/object/weak_block.cpp
index 2675271..90f3006 100644 (file)
--- a/src/object/weak_block.cpp
+++ b/src/object/weak_block.cpp
@@ -34,7 +34,7 @@ WeakBlock::WeakBlock(const lisp::Lisp& lisp)
   : MovingSprite(lisp, "images/objects/strawbox/strawbox.sprite", LAYER_TILES, COLGROUP_STATIC), state(STATE_NORMAL)
 {
   sprite->set_action("normal");
-  flags |= FLAG_SOLID;
+  set_solid(true);
 }
 
 HitResponse
@@ -44,8 +44,8 @@ WeakBlock::collision(GameObject& other, const CollisionHit& )
 
     case STATE_NORMAL:
       if (dynamic_cast<Bullet*>(&other)) {
-       startBurning();
-       return FORCE_MOVE;
+        startBurning();
+        return FORCE_MOVE;
       }
       return FORCE_MOVE;
       break;
@@ -74,18 +74,18 @@ WeakBlock::update(float )
 
     case STATE_BURNING:
       if (sprite->animation_done()) {
-       state = STATE_DISINTEGRATING;
-       sprite->set_action("disintegrating", 1);
-       spreadHit();
-       flags &= ~FLAG_SOLID;
+        state = STATE_DISINTEGRATING;
+        sprite->set_action("disintegrating", 1);
+        spreadHit();
+        set_solid(false);
         set_group(COLGROUP_DISABLED);
       }
       break;
 
     case STATE_DISINTEGRATING:
       if (sprite->animation_done()) {
-       remove_me();
-       return;
+        remove_me();
+        return;
       }
       break;