#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];
return;
}
+ // fixes the "affected even while blinking" bug
+ if (safe_timer.started() && this->get_group() != COLGROUP_MOVING_ONLY_STATIC) {
+ this->set_group(COLGROUP_MOVING_ONLY_STATIC);
+ }
+ else if (!safe_timer.started() && this->get_group() == COLGROUP_MOVING_ONLY_STATIC) {
+ this->set_group(COLGROUP_MOVING);
+ }
+
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;
}
}
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;
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::kick()
+{
+ kick_timer.start(KICK_TIME);
+}
+
+void
Player::draw(DrawingContext& context)
{
TuxBodyParts* tux_body;
}
}
+void
+Player::collision_tile(uint32_t tile_attributes)
+{
+ if(tile_attributes & Tile::HURTS)
+ kill(SHRINK);
+}
+
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) {
- TileMap* tilemap = dynamic_cast<TileMap*> (&other);
- if(tilemap) {
- const TilemapCollisionHit* thit =
- static_cast<const TilemapCollisionHit*> (&hit);
- if(thit->tileflags & Tile::SPIKE)
- kill(SHRINK);
-
- if(! (thit->tileflags & Tile::SOLID))
- return FORCE_MOVE;
- }
-
if(hit.normal.y < 0) { // landed on floor?
- if (physic.get_velocity_y() < 0)
+ if(physic.get_velocity_y() < 0)
physic.set_velocity_y(0);
on_ground_flag = true;
} else if(hit.normal.y > 0) { // bumped against the roof
if(trigger) {
if(controller->pressed(Controller::UP))
trigger->event(*this, TriggerBase::EVENT_ACTIVATE);
+
+ return FORCE_MOVE;
}
+ BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
+ if(badguy != NULL)
+ return CONTINUE;
+
+#if 0
+ MovingObject* moving_object = static_cast<MovingObject*> (&other);
+ if(moving_object->get_group() == COLGROUP_TOUCHABLE)
+ return FORCE_MOVE;
+
+ if(is_invincible())
+ return FORCE_MOVE;
+
+ return CONTINUE;
+#endif
return FORCE_MOVE;
}
player_status->bonus = NO_BONUS;
dying = true;
dying_timer.start(3.0);
- flags |= FLAG_NO_COLLDET;
+ set_group(COLGROUP_DISABLED);
}
}
projects / supertux.git / blobdiff