last_ground_y = 0;
fall_mode = ON_GROUND;
jumping = false;
- double_jumping = false;
+ flapping = false;
can_jump = true;
- can_double_jump = false;
+ can_flap = false;
+ falling_from_flap = false;
enable_hover = false;
butt_jump = false;
shooting_timer.init(true);
growing_timer.init(true);
idle_timer.init(true);
+ flapping_timer.init(true);
physic.reset();
}
physic.set_velocity_y(0);
jumped_in_solid = true;
jumping = false;
+ flapping = false;
}
}
else
{
/* Make sure jumping is off. */
jumping = false;
+ flapping = false;
}
}
}
void
Player::handle_vertical_input()
{
+
// set fall mode...
if(on_ground()) {
fall_mode = ON_GROUND;
// Press jump key
if(input.up == DOWN && can_jump && on_ground())
{
- global_stats.add_points(JUMPS_STAT, 1);
-
if(duck) { // only jump a little bit when in duck mode {
physic.set_velocity_y(3);
} else {
--base.y;
jumping = true;
- double_jumping = false;
+ flapping = false;
can_jump = false;
- can_double_jump = false;
+ can_flap = false;
if (size == SMALL)
SoundManager::get()->play_sound(IDToSound(SND_JUMP));
else
SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
}
// Let go of jump key
- else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
+ else if(input.up == UP)
{
- if (!double_jumping && !duck) {can_double_jump = true;}
- jumping = false;
- physic.set_velocity_y(0);
+ if (!flapping && !duck && !falling_from_flap && !on_ground())
+ {
+ can_flap = true;
+ }
+ if (jumping && physic.get_velocity_y() > 0)
+ {
+ jumping = false;
+ physic.set_velocity_y(0);
+ }
}
-
- // Double jump
- if (input.up == DOWN && can_double_jump)
+
+ // Flapping
+ if (input.up == DOWN && can_flap)
{
- can_double_jump = false;
+ if (!flapping_timer.started())
+ {
+ flapping_timer.start(TUX_FLAPPING_TIME);
+ }
+ if (!flapping_timer.check())
+ {
+ can_flap = false;
+ falling_from_flap = true;
+ }
jumping = true;
- double_jumping = true;
- if (size == SMALL)
- SoundManager::get()->play_sound(IDToSound(SND_JUMP));
- else
- SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
- physic.set_velocity_y(5.2);
+ flapping = true;
+ if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME)
+ {
+ physic.set_velocity_y((float)flapping_timer.get_gone()/450);
+ }
}
// Hover
}
if(on_ground()) /* Make sure jumping is off. */
- jumping = false;
+ {
+ jumping = false;
+ flapping = false;
+ falling_from_flap = false;
+ if (flapping_timer.started()) {flapping_timer.stop();}
+ }
input.old_up = input.up;
}