X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fskull_tile.cpp;h=025b5e8ae4d76f368213d8cbd4bbdbf66a63bc41;hb=a98f7cee9f6a2593c0e1f3442800f159bad410df;hp=abbddd8164c6f59e54aaa1f249bccb342468e746;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp index abbddd816..025b5e8ae 100644 --- a/src/object/skull_tile.cpp +++ b/src/object/skull_tile.cpp @@ -28,13 +28,12 @@ #include "sprite/sprite.hpp" #include "random_generator.hpp" -static const float CRACKTIME = 0.3; -static const float FALLTIME = 0.8; +static const float CRACKTIME = 0.3f; +static const float FALLTIME = 0.8f; SkullTile::SkullTile(const lisp::Lisp& lisp) : MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), hit(false), falling(false) { - flags |= FLAG_SOLID; } HitResponse @@ -54,7 +53,7 @@ SkullTile::draw(DrawingContext& context) // shacking if(timer.get_timegone() > CRACKTIME) { pos.x += systemRandom.rand(-3, 3); - } + } sprite->draw(context, pos, layer); } @@ -71,8 +70,7 @@ SkullTile::update(float elapsed_time) } else if(hit) { if(timer.check()) { falling = true; - physic.enable_gravity(true); - flags &= ~FLAG_SOLID; + physic.enable_gravity(true); timer.stop(); } else if(!timer.started()) { timer.start(FALLTIME);