X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=dad7103b41fa762a6fb5a83a21225b491fe09b81;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=8bde2fbd3637860dfca973e639f910a58aeff765;hpb=a983f6648d43492632c41e2b7519b70458b53cf4;p=supertux.git diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp index 8bde2fbd3..dad7103b4 100644 --- a/src/badguy/stalactite.cpp +++ b/src/badguy/stalactite.cpp @@ -28,7 +28,7 @@ static const float SQUISH_TIME = 2; static const float SHAKE_RANGE_Y = 400; Stalactite::Stalactite(const lisp::Lisp& lisp) - : BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING) + : BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING) { countMe = false; } @@ -51,7 +51,7 @@ Stalactite::active_update(float elapsed_time) if(player->get_bbox().p2.x > bbox.p1.x - SHAKE_RANGE_X && player->get_bbox().p1.x < bbox.p2.x + SHAKE_RANGE_X && player->get_bbox().p2.y > bbox.p1.y - && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) { + && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) { timer.start(SHAKE_TIME); state = STALACTITE_SHAKING; } @@ -72,7 +72,7 @@ void Stalactite::squish() { state = STALACTITE_SQUISHED; - set_group(COLGROUP_MOVING_ONLY_STATIC); + set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC); sprite->set_action("squished"); if(!timer.started()) timer.start(SQUISH_TIME);