namespace {
const float KICKSPEED = 500;
const int MAXSQUISHES = 10;
+ const float NOKICK_TIME = 0.1f;
}
MrIceBlock::MrIceBlock(const lisp::Lisp& reader)
}
void
-MrIceBlock::activate()
+MrIceBlock::initialize()
{
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
set_state(ICESTATE_NORMAL);
}
if(hit.right && dir == RIGHT) {
dir = LEFT;
sound_manager->play("sounds/iceblock_bump.wav", get_pos());
+ if(++squishcount >= MAXSQUISHES) { kill_fall(); break; }
physic.set_velocity_x(-KICKSPEED);
} else if(hit.left && dir == LEFT) {
dir = RIGHT;
sound_manager->play("sounds/iceblock_bump.wav", get_pos());
+ if(++squishcount >= MAXSQUISHES) { kill_fall(); break; }
physic.set_velocity_x(KICKSPEED);
}
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
if(ice_state == ICESTATE_GRABBED)
return FORCE_MOVE;
+ if(dir == UP) {
+ return FORCE_MOVE;
+ }
+
// handle kicks from left or right side
if(ice_state == ICESTATE_FLAT && get_state() == STATE_ACTIVE) {
if(hit.left) {
switch(ice_state) {
case ICESTATE_KICKED:
case ICESTATE_NORMAL:
- squishcount++;
- if(squishcount >= MAXSQUISHES) {
- kill_fall();
- return true;
+ {
+ Player* player = dynamic_cast<Player*>(&object);
+ squishcount++;
+ if ((squishcount >= MAXSQUISHES) || (player && player->does_buttjump)) {
+ kill_fall();
+ return true;
+ }
}
set_state(ICESTATE_FLAT);
+ nokick_timer.start(NOKICK_TIME);
break;
case ICESTATE_FLAT:
{
dir = LEFT;
}
}
- set_state(ICESTATE_KICKED);
+ if (nokick_timer.check()) set_state(ICESTATE_KICKED);
break;
case ICESTATE_GRABBED:
assert(false);
switch(state) {
case ICESTATE_NORMAL:
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
break;
case ICESTATE_FLAT:
- sound_manager->play("sounds/stomp.wav", get_pos());
- physic.set_velocity_x(0);
- physic.set_velocity_y(0);
-
- sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+ if(dir == UP) {
+ physic.set_velocity_y(-KICKSPEED);
+ bbox.set_size(34, 31.8f);
+ } else {
+ sound_manager->play("sounds/stomp.wav", get_pos());
+ physic.set_velocity_x(0);
+ physic.set_velocity_y(0);
+
+ sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+ }
flat_timer.start(4);
break;
case ICESTATE_KICKED:
physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
// we should slide above 1 block holes now...
- bbox.set_size(34, 31.8);
+ bbox.set_size(34, 31.8f);
break;
case ICESTATE_GRABBED:
flat_timer.stop();
this->dir = dir;
sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
set_state(ICESTATE_GRABBED);
- set_group(COLGROUP_DISABLED);
+ set_colgroup_active(COLGROUP_DISABLED);
}
void
MrIceBlock::ungrab(MovingObject& , Direction dir)
{
this->dir = dir;
- set_state(ICESTATE_KICKED);
- set_group(COLGROUP_MOVING);
+ set_state(dir == UP ? ICESTATE_FLAT : ICESTATE_KICKED);
+ set_colgroup_active(COLGROUP_MOVING);
}
bool