#include "stalactite.hpp"
#include "random_generator.hpp"
-static const int SHAKE_RANGE = 40;
+static const int SHAKE_RANGE_X = 40;
static const float SHAKE_TIME = .8;
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"), state(STALACTITE_HANGING)
if(state == STALACTITE_HANGING) {
Player* player = this->get_nearest_player();
if (player) {
- if(player->get_bbox().p2.x > bbox.p1.x - SHAKE_RANGE
- && player->get_bbox().p1.x < bbox.p2.x + SHAKE_RANGE
- && player->get_bbox().p2.y > bbox.p1.y) {
+ 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) {
timer.start(SHAKE_TIME);
state = STALACTITE_SHAKING;
}
}
}
-HitResponse
-Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
+void
+Stalactite::collision_solid(const CollisionHit& hit)
{
if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
- return FORCE_MOVE;
+ return;
- if(hit.normal.y < .9) { // hit floor?
+ if(hit.bottom) { // hit floor?
state = STALACTITE_SQUISHED;
set_group(COLGROUP_MOVING_ONLY_STATIC);
physic.set_velocity_y(0);
if(!timer.started())
timer.start(SQUISH_TIME);
}
-
- return CONTINUE;
}
HitResponse
-Stalactite::collision_player(Player& player, const CollisionHit& )
+Stalactite::collision_player(Player& player)
{
if(state != STALACTITE_SQUISHED) {
player.kill(false);