X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=012adaa5c80f5ff945eaefcae09d3bb38adb03ca;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=233a672acc27e8c737cf69da61b80b8ead0f4e29;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp index 233a672ac..012adaa5c 100644 --- a/src/badguy/jumpy.cpp +++ b/src/badguy/jumpy.cpp @@ -62,7 +62,7 @@ Jumpy::hit(const CollisionHit& chit) 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"); @@ -77,19 +77,19 @@ void 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) &&