// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
-
#include <config.h>
-#include "badguy.h"
-#include "object/camera.h"
+#include "badguy.hpp"
+#include "object/camera.hpp"
+#include "statistics.hpp"
static const float SQUISH_TIME = 2;
static const float X_OFFSCREEN_DISTANCE = 1600;
static const float Y_OFFSCREEN_DISTANCE = 1200;
BadGuy::BadGuy()
- : sprite(0), dir(LEFT), state(STATE_INIT)
+ : countMe(true), sprite(0), dir(LEFT), state(STATE_INIT)
{
- //Set hitpoints and bullet hitpoints
- hitpoints = 1;
- bullet_hitpoints = 1;
}
BadGuy::~BadGuy()
return;
if(state == STATE_FALLING) {
uint32_t old_effect = context.get_drawing_effect();
- context.set_drawing_effect(old_effect & VERTICAL_FLIP);
+ context.set_drawing_effect(old_effect | VERTICAL_FLIP);
sprite->draw(context, get_pos(), LAYER_OBJECTS);
context.set_drawing_effect(old_effect);
} else {
}
void
-BadGuy::action(float elapsed_time)
+BadGuy::update(float elapsed_time)
{
if(!Sector::current()->inside(bbox)) {
remove_me();
switch(state) {
case STATE_ACTIVE:
- active_action(elapsed_time);
+ active_update(elapsed_time);
break;
case STATE_INIT:
case STATE_INACTIVE:
- inactive_action(elapsed_time);
+ inactive_update(elapsed_time);
try_activate();
break;
case STATE_SQUISHED:
}
void
-BadGuy::active_action(float elapsed_time)
+BadGuy::active_update(float elapsed_time)
{
movement = physic.get_movement(elapsed_time);
}
void
-BadGuy::inactive_action(float )
+BadGuy::inactive_update(float )
{
}
}
HitResponse
-BadGuy::collision_player(Player& player, const CollisionHit& hit)
+BadGuy::collision_player(Player& player, const CollisionHit& )
{
if(player.is_invincible()) {
kill_fall();
return ABORT_MOVE;
}
- if(hit.normal.y > .9) {
- //TODO: fix inaccuracy (tux sometimes dies even if badguy was hit)
- // give badguys some invincible time (prevent them from being hit multiple times)
- hitpoints--;
- bullet_hitpoints--;
- if(collision_squished(player))
- return ABORT_MOVE;
- else if (hitpoints <= 0) {
- bullet_hitpoints = 0;
+ // hit from above?
+ if(player.get_movement().y - get_movement().y > 0 && player.get_bbox().p2.y <
+ (get_bbox().p1.y + get_bbox().p2.y) / 2) {
+ // if it's not is it possible to squish us, then this will hurt
+ if(!collision_squished(player))
player.kill(Player::SHRINK);
- return FORCE_MOVE;
- }
+
+ return FORCE_MOVE;
}
player.kill(Player::SHRINK);
return FORCE_MOVE;
void
BadGuy::kill_squished(Player& player)
{
- sound_manager->play_sound("squish", get_pos(), player.get_pos());
+ sound_manager->play("sounds/squish.wav", get_pos());
physic.enable_gravity(true);
physic.set_velocity_x(0);
physic.set_velocity_y(0);
set_state(STATE_SQUISHED);
+ global_stats.add_points(BADGUYS_KILLED_STAT, 1);
player.bounce(*this);
}
void
BadGuy::kill_fall()
{
- bullet_hitpoints--;
- if (bullet_hitpoints <= 0) {
- hitpoints = 0;
- sound_manager->play_sound("fall", this,
- Sector::current()->player->get_pos());
- physic.set_velocity_y(0);
- physic.enable_gravity(true);
- set_state(STATE_FALLING);
- }
+ sound_manager->play("sounds/fall.wav", get_pos());
+ global_stats.add_points(BADGUYS_KILLED_STAT, 1);
+ physic.set_velocity_y(0);
+ physic.enable_gravity(true);
+ set_state(STATE_FALLING);
}
void