#include "game_session.hpp"
#include "object/tilemap.hpp"
#include "object/camera.hpp"
-#include "object/gameobjs.hpp"
+#include "object/particles.hpp"
#include "object/portable.hpp"
+#include "object/bullet.hpp"
#include "trigger/trigger_base.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "main.hpp"
+#include "badguy/badguy.hpp"
#include "player_status.hpp"
static const int TILES_FOR_BUTTJUMP = 3;
static const float MAX_RUN_XM = 320;
static const float WALK_SPEED = 100;
+static const float KICK_TIME = .3;
+
// growing animation
Surface* growingtux_left[GROWING_FRAMES];
Surface* growingtux_right[GROWING_FRAMES];
: player_status(_player_status), grabbed_object(0)
{
controller = main_controller;
- smalltux_gameover = sprite_manager->create("smalltux-gameover");
- smalltux_star = sprite_manager->create("smalltux-star");
- bigtux_star = sprite_manager->create("bigtux-star");
+ smalltux_gameover = sprite_manager->create("images/creatures/tux_small/smalltux-gameover.sprite");
+ smalltux_star = sprite_manager->create("images/creatures/tux_small/smalltux-star.sprite");
+ bigtux_star = sprite_manager->create("images/creatures/tux_big/bigtux-star.sprite");
init();
}
deactivated = false;
backflipping = false;
backflip_direction = 0;
+ visible = true;
on_ground_flag = false;
grabbed_object = 0;
+ floor_normal = Vector(0,-1);
+
physic.reset();
}
void
Player::update(float elapsed_time)
{
+ // do we need to enable gravity again?
+ if(on_ground_flag) {
+ Rect lower = bbox;
+ lower.move(Vector(0, 4.0));
+ if(Sector::current()->is_free_space(lower)) {
+ physic.enable_gravity(true);
+ on_ground_flag = false;
+ }
+ }
+
if(dying && dying_timer.check()) {
dead = true;
return;
}
if(!controller->hold(Controller::ACTION) && grabbed_object) {
- grabbed_object = 0;
// move the grabbed object a bit away from tux
Vector pos = get_pos() +
- Vector(dir == LEFT ? -bbox.get_width() : bbox.get_width(),
+ Vector(dir == LEFT ? -bbox.get_width()-1 : bbox.get_width()+1,
bbox.get_height()*0.66666 - 32);
- MovingObject* object = dynamic_cast<MovingObject*> (grabbed_object);
- if(object) {
- object->set_pos(pos);
- } else {
+ Rect dest(pos, pos + Vector(32, 32));
+ if(Sector::current()->is_free_space(dest)) {
+ MovingObject* moving_object = dynamic_cast<MovingObject*> (grabbed_object);
+ if(moving_object) {
+ moving_object->set_pos(pos);
+ } else {
#ifdef DEBUG
- std::cout << "Non MovingObjetc grabbed?!?\n";
+ std::cout << "Non MovingObjetc grabbed?!?\n";
#endif
+ }
+ grabbed_object->ungrab(*this, dir);
+ grabbed_object = 0;
}
}
handle_input();
movement = physic.get_movement(elapsed_time);
- on_ground_flag = false;
#if 0
// special exception for cases where we're stuck under tiles after
Vector pos = get_pos() +
Vector(dir == LEFT ? -16 : 16,
bbox.get_height()*0.66666 - 32);
- grabbed_object->grab(*this, pos);
+ grabbed_object->grab(*this, pos, dir);
}
}
// dust some particles
Sector::current()->add_object(
new Particles(
- Vector(bbox.p1.x + (dir == RIGHT ? bbox.get_width() : 0),
- bbox.p2.y),
+ Vector(dir == RIGHT ? bbox.p2.x : bbox.p1.x, bbox.p2.y),
dir == RIGHT ? 270+20 : 90-40, dir == RIGHT ? 270+40 : 90-20,
- Vector(280,-260), Vector(0,0.030), 3, Color(100,100,100), 3, .8,
+ Vector(280, -260), Vector(0, 300), 3, Color(.4, .4, .4), 3, .8,
LAYER_OBJECTS+1));
ax *= 2.5;
// extend/shrink tux collision rectangle so that we fall through/walk over 1
// tile holes
if(fabsf(vx) > MAX_WALK_XM) {
- bbox.set_width(33);
+ bbox.set_width(34);
} else {
bbox.set_width(31.8);
}
+ // on downward slopes, adjust vertical velocity to match slope angle
+ if (on_ground()) {
+ if (floor_normal.y != 0) {
+ if ((floor_normal.x * vx) > 0) {
+ // we overdo it a little, just to be on the safe side
+ vy = vx * (floor_normal.x / floor_normal.y) * 2;
+ }
+ }
+ }
+
physic.set_velocity(vx, vy);
physic.set_acceleration(ax, ay);
}
bbox.move(Vector(0, 32));
bbox.set_height(31.8);
} else if(!controller->hold(Controller::DOWN) && is_big() && duck) {
- // try if we can really unduck
+ // if we have some velocity left then check if there is space for
+ // unducking
bbox.move(Vector(0, -32));
bbox.set_height(63.8);
- duck = false;
- // FIXME
-#if 0
- // when unducking in air we need some space to do so
- if(on_ground() || !collision_object_map(bbox)) {
+ if(Sector::current()->is_free_space(bbox) || (
+ physic.get_velocity_x() > -.01 && physic.get_velocity_x() < .01
+ && physic.get_velocity_y() > -.01 && physic.get_velocity_y() < .01))
+ {
duck = false;
} else {
// undo the ducking changes
bbox.move(Vector(0, 32));
- bbox.set_height(31.8);
+ bbox.set_height(31.8);
}
-#endif
}
}
}
void
+Player::set_visible(bool visible)
+{
+ this->visible = visible;
+}
+
+bool
+Player::get_visible()
+{
+ return visible;
+}
+
+void
+Player::kick()
+{
+ kick_timer.start(KICK_TIME);
+}
+
+void
Player::draw(DrawingContext& context)
{
+ if(!visible)
+ return;
+
TuxBodyParts* tux_body;
if (player_status->bonus == GROWUP_BONUS)
HitResponse
Player::collision(GameObject& other, const CollisionHit& hit)
{
- Portable* portable = dynamic_cast<Portable*> (&other);
- if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
- && fabsf(hit.normal.x) > .9) {
- grabbed_object = portable;
- return CONTINUE;
+ Bullet* bullet = dynamic_cast<Bullet*> (&other);
+ if(bullet) {
+ return FORCE_MOVE;
+ }
+
+ if(other.get_flags() & FLAG_PORTABLE) {
+ Portable* portable = dynamic_cast<Portable*> (&other);
+ if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION)
+ && fabsf(hit.normal.x) > .9) {
+ grabbed_object = portable;
+ return CONTINUE;
+ }
}
if(other.get_flags() & FLAG_SOLID) {
if(physic.get_velocity_y() < 0)
physic.set_velocity_y(0);
on_ground_flag = true;
+
+ // remember normal of this tile
+ if (hit.normal.y > -0.9) {
+ floor_normal.x = hit.normal.x;
+ floor_normal.y = hit.normal.y;
+ } else {
+ // slowly adjust to unisolid tiles.
+ // Necessary because our bounding box sometimes reaches through slopes and thus hits unisolid tiles
+ floor_normal.x = (floor_normal.x * 0.9) + (hit.normal.x * 0.1);
+ floor_normal.y = (floor_normal.y * 0.9) + (hit.normal.y * 0.1);
+ }
+
+ // disable gravity
+ physic.enable_gravity(false);
} else if(hit.normal.y > 0) { // bumped against the roof
physic.set_velocity_y(.1);
}
return CONTINUE;
}
- TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
- if(trigger) {
- if(controller->pressed(Controller::UP))
- trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+#ifdef DEBUG
+ assert(dynamic_cast<MovingObject*> (&other) != NULL);
+#endif
+ MovingObject* moving_object = static_cast<MovingObject*> (&other);
+ if(moving_object->get_group() == COLGROUP_TOUCHABLE) {
+ TriggerBase* trigger = dynamic_cast<TriggerBase*> (&other);
+ if(trigger) {
+ if(controller->pressed(Controller::UP))
+ trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+ }
return FORCE_MOVE;
}
- return CONTINUE;
+ BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+ if(badguy != NULL) {
+ if(safe_timer.started())
+ return FORCE_MOVE;
+
+ return CONTINUE;
+ }
+
+ return FORCE_MOVE;
}
void
return;
if(mode != KILL &&
- safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
+ (safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0))
return;
sound_manager->play("sounds/hurt.wav");
dying = true;
dying_timer.start(3.0);
set_group(COLGROUP_DISABLED);
+
+ DisplayEffect* effect = new DisplayEffect();
+ effect->fade_out(3.0);
+ Sector::current()->add_object(effect);
+ sound_manager->stop_music(3.0);
}
}
bbox.set_size(31.8, 63.8);
else
bbox.set_size(31.8, 31.8);
- on_ground_flag = false;
duck = false;
last_ground_y = vector.y;
projects / supertux.git / blobdiff