}
void
-Snail::activate()
+Snail::initialize()
{
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
be_normal();
}
if (state == STATE_NORMAL) return;
state = STATE_NORMAL;
- WalkingBadguy::activate();
+ WalkingBadguy::initialize();
}
void
physic.set_velocity_y(0);
// start a timer to delay addition of upward movement until we are (hopefully) out from under the player
- kicked_delay_timer.start(0.05);
+ kicked_delay_timer.start(0.05f);
}
bool
case STATE_KICKED:
case STATE_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;
+ }
}
sound_manager->play("sounds/stomp.wav", get_pos());