X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.cpp;h=044953081f4f20d0d973a9321959d62db1eba07f;hb=2d1bc69993923150eb701d3cacb917ab4e23d5ef;hp=b28b03ed50d91946b602394b46531ea3bbfc155e;hpb=714a30abd887def6331a193216387e66cbfbd1bb;p=supertux.git diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp index b28b03ed5..044953081 100644 --- a/src/badguy/bouncing_snowball.cpp +++ b/src/badguy/bouncing_snowball.cpp @@ -25,7 +25,7 @@ static const float JUMPSPEED = -450; static const float WALKSPEED = 80; BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite") + : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite") { } @@ -39,16 +39,16 @@ BouncingSnowball::write(lisp::Writer& writer) { writer.start_list("bouncingsnowball"); - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); + writer.write("x", start_position.x); + writer.write("y", start_position.y); writer.end_list("bouncingsnowball"); } void -BouncingSnowball::activate() +BouncingSnowball::initialize() { - physic.vx = (dir == LEFT ? -WALKSPEED : WALKSPEED); + physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); } @@ -65,18 +65,18 @@ BouncingSnowball::collision_solid(const CollisionHit& hit) { if(hit.bottom) { if(get_state() == STATE_ACTIVE) { - physic.vy = JUMPSPEED; + physic.set_velocity_y(JUMPSPEED); } else { - physic.vy = 0; + physic.set_velocity_y(0); } } else if(hit.top) { - physic.vy = 0; + physic.set_velocity_y(0); } if(hit.left || hit.right) { // left or right collision dir = dir == LEFT ? RIGHT : LEFT; sprite->set_action(dir == LEFT ? "left" : "right"); - physic.vx = -physic.vx; + physic.set_velocity_x(-physic.get_velocity_x()); } }