#include <iostream>
#include <cassert>
-#include "gameloop.h"
#include "app/globals.h"
#include "player.h"
#include "defines.h"
#include "interactive_object.h"
#include "video/screen.h"
#include "statistics.h"
+#include "gameloop.h"
// behavior definitions:
#define TILES_FOR_BUTTJUMP 3
flapping = false;
can_jump = true;
can_flap = false;
+ falling_from_flap = false;
enable_hover = false;
butt_jump = false;
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 {
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 (!flapping && !duck)
+ if (!flapping && !duck && !falling_from_flap && !on_ground())
{
can_flap = true;
}
- jumping = false;
- physic.set_velocity_y(0);
+ if (jumping && physic.get_velocity_y() > 0)
+ {
+ jumping = false;
+ physic.set_velocity_y(0);
+ }
}
-
+
// Flapping
if (input.up == DOWN && can_flap)
{
- if (!flapping_timer.started()) {flapping_timer.start(TUX_FLAPPING_TIME);}
- if (!flapping_timer.check()) {can_flap = false;}
+ if (!flapping_timer.started())
+ {
+ flapping_timer.start(TUX_FLAPPING_TIME);
+ }
+ if (!flapping_timer.check())
+ {
+ can_flap = false;
+ falling_from_flap = true;
+ }
jumping = true;
flapping = true;
if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME)
BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
if(badguy)
{
-
- if (fabsf(base.x - badguy->base.x) < 150 &&
- fabsf(base.y - badguy->base.y) < 60 &&
- (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
- issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
- badguy->kill_me(25);
+ // don't kill when badguys are already dying or in a certain mode
+ if(badguy->dying == DYING_NOT && badguy->mode != BadGuy::BOMB_TICKING &&
+ badguy->mode != BadGuy::BOMB_EXPLODE)
+ {
+ if (fabsf(base.x - badguy->base.x) < 150 &&
+ fabsf(base.y - badguy->base.y) < 60 &&
+ (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+ issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+ badguy->kill_me(25);
+ }
}
}
}
}
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;
}
void
Player::bounce(BadGuy* badguy)
{
+ //Make sure we stopped flapping
+ flapping = false;
+ falling_from_flap = false;
+
if (input.up)
physic.set_velocity_y(5.2);
else