X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fzeekling.cpp;h=4cdec6a5a22d994f1dd95823dac2740d6ede9497;hb=714a30abd887def6331a193216387e66cbfbd1bb;hp=64a45669e36079b8e07b8893f43b75e8bcfa23b6;hpb=ac6e2c650797fb7db2e04df9c7514c075a53f0d7;p=supertux.git diff --git a/src/badguy/zeekling.cpp b/src/badguy/zeekling.cpp index 64a45669e..4cdec6a5a 100644 --- a/src/badguy/zeekling.cpp +++ b/src/badguy/zeekling.cpp @@ -52,8 +52,8 @@ void Zeekling::activate() { speed = systemRandom.rand(130, 171); - physic.set_velocity_x(dir == LEFT ? -speed : speed); - physic.enable_gravity(false); + physic.vx = (dir == LEFT ? -speed : speed); + physic.gravity_enabled = false; sprite->set_action(dir == LEFT ? "left" : "right"); } @@ -71,19 +71,19 @@ Zeekling::onBumpHorizontal() { if (state == FLYING) { dir = (dir == LEFT ? RIGHT : LEFT); sprite->set_action(dir == LEFT ? "left" : "right"); - physic.set_velocity_x(dir == LEFT ? -speed : speed); + physic.vx = (dir == LEFT ? -speed : speed); } else if (state == DIVING) { dir = (dir == LEFT ? RIGHT : LEFT); state = FLYING; sprite->set_action(dir == LEFT ? "left" : "right"); - physic.set_velocity_x(dir == LEFT ? -speed : speed); - physic.set_velocity_y(0); + physic.vx = (dir == LEFT ? -speed : speed); + physic.vy = 0; } else if (state == CLIMBING) { dir = (dir == LEFT ? RIGHT : LEFT); sprite->set_action(dir == LEFT ? "left" : "right"); - physic.set_velocity_x(dir == LEFT ? -speed : speed); + physic.vx = (dir == LEFT ? -speed : speed); } else { assert(false); } @@ -92,16 +92,16 @@ Zeekling::onBumpHorizontal() { void Zeekling::onBumpVertical() { if (state == FLYING) { - physic.set_velocity_y(0); + physic.vy = 0; } else if (state == DIVING) { state = CLIMBING; - physic.set_velocity_y(-speed); + physic.vy = -speed; sprite->set_action(dir == LEFT ? "left" : "right"); } else if (state == CLIMBING) { state = FLYING; - physic.set_velocity_y(0); + physic.vy = 0; } } @@ -172,7 +172,7 @@ Zeekling::active_update(float elapsed_time) { if (state == FLYING) { if (should_we_dive()) { state = DIVING; - physic.set_velocity_y(2*fabsf(physic.get_velocity_x())); + physic.vy = 2*fabsf(physic.vx); sprite->set_action(dir == LEFT ? "diving-left" : "diving-right"); } BadGuy::active_update(elapsed_time); @@ -184,7 +184,7 @@ Zeekling::active_update(float elapsed_time) { // stop climbing when we're back at initial height if (get_pos().y <= start_position.y) { state = FLYING; - physic.set_velocity_y(0); + physic.vy = 0; } BadGuy::active_update(elapsed_time); return;