X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fweak_block.cpp;h=c8a4c38a4e39c603e789d6667008e7a9bbba6f7d;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=90f3006cd3e4485621d95e6dca1e0a9c0c0cf48c;hpb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;p=supertux.git diff --git a/src/object/weak_block.cpp b/src/object/weak_block.cpp index 90f3006cd..c8a4c38a4 100644 --- a/src/object/weak_block.cpp +++ b/src/object/weak_block.cpp @@ -21,6 +21,7 @@ #include #include "weak_block.hpp" + #include "lisp/lisp.hpp" #include "object_factory.hpp" #include "player.hpp" @@ -30,11 +31,12 @@ #include "random_generator.hpp" #include "object/bullet.hpp" +#include + WeakBlock::WeakBlock(const lisp::Lisp& lisp) : MovingSprite(lisp, "images/objects/strawbox/strawbox.sprite", LAYER_TILES, COLGROUP_STATIC), state(STATE_NORMAL) { sprite->set_action("normal"); - set_solid(true); } HitResponse @@ -77,7 +79,6 @@ WeakBlock::update(float ) state = STATE_DISINTEGRATING; sprite->set_action("disintegrating", 1); spreadHit(); - set_solid(false); set_group(COLGROUP_DISABLED); } break;