X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fnolok_01.cpp;h=5888039b0b1883e9500542c3087fdd9ed9f64497;hb=e957829ea32995323524f3f73fa68ec117c8a171;hp=925e4de907851a8aeacef5e2ca63cc61be8b55ba;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp index 925e4de90..5888039b0 100644 --- a/src/badguy/nolok_01.cpp +++ b/src/badguy/nolok_01.cpp @@ -21,7 +21,7 @@ #include #include "nolok_01.hpp" -#include "badguy/bouncing_snowball.hpp" +#include "badguy/snowsnail.hpp" #include "trigger/door.hpp" #define WALK_TIME 2.5 @@ -38,7 +38,7 @@ Nolok_01::Nolok_01(const lisp::Lisp& reader) reader.get("x", start_position.x); reader.get("y", start_position.y); bbox.set_size(31.8, 63.8); - sprite = sprite_manager->create("dummyguy"); + sprite = sprite_manager->create("nolok"); countMe = false; } @@ -47,7 +47,7 @@ Nolok_01::Nolok_01(float pos_x, float pos_y) start_position.x = pos_x; start_position.y = pos_y; bbox.set_size(31.8, 63.8); - sprite = sprite_manager->create("dummyguy"); + sprite = sprite_manager->create("nolok"); countMe = false; } @@ -95,8 +95,8 @@ Nolok_01::active_update(float elapsed_time) } case SHOOTING: { - Sector::current()->add_object(new BouncingSnowball(get_pos().x - 64, get_pos().y, LEFT)); - Sector::current()->add_object(new BouncingSnowball(get_pos().x + 64, get_pos().y, RIGHT)); + Sector::current()->add_object(new SnowSnail(get_pos().x - 64, get_pos().y, LEFT)); + Sector::current()->add_object(new SnowSnail(get_pos().x + 64, get_pos().y, RIGHT)); physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); action = WALKING;