}
void
-MrIceBlock::activate()
+MrIceBlock::initialize()
{
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
set_state(ICESTATE_NORMAL);
}
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);
switch(state) {
case ICESTATE_NORMAL:
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
break;
case ICESTATE_FLAT:
if(dir == UP) {
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
{
this->dir = dir;
set_state(dir == UP ? ICESTATE_FLAT : ICESTATE_KICKED);
- set_group(COLGROUP_MOVING);
+ set_colgroup_active(COLGROUP_MOVING);
}
bool