writer.end_list("jumpy");
}
-HitResponse
-Jumpy::collision_solid(GameObject& , const CollisionHit& chit)
+void
+Jumpy::collision_solid(const CollisionHit& chit)
{
- return hit(chit);
+ hit(chit);
}
HitResponse
HitResponse
Jumpy::hit(const CollisionHit& chit)
{
- // hit floor?
- if(chit.normal.y < -.5) {
+ if(chit.bottom) {
if (!groundhit_pos_set)
{
pos_groundhit = get_pos();
groundhit_pos_set = true;
}
-
+
physic.set_velocity_y(JUMPSPEED);
// TODO create a nice sound for this...
//sound_manager->play("sounds/skid.wav");
- } else if(chit.normal.y < .5) { // bumped on roof
+ } else if(chit.top) {
physic.set_velocity_y(0);
}
Jumpy::active_update(float elapsed_time)
{
BadGuy::active_update(elapsed_time);
-
+
Player* player = this->get_nearest_player();
if (player)
{
dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
}
-
+
if (!groundhit_pos_set)
{
sprite->set_action(dir == LEFT ? "left-middle" : "right-middle");
return;
}
-
+
if ( get_pos().y < (pos_groundhit.y - JUMPY_MID_TOLERANCE ) )
sprite->set_action(dir == LEFT ? "left-up" : "right-up");
else if ( get_pos().y >= (pos_groundhit.y - JUMPY_MID_TOLERANCE) &&