X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.cpp;h=4d1d75a278538fcdef04f67b142c6d3e3260fc3e;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=e881933dc1ae96c03245f5d46bbb929768868a2a;hpb=ff59adfe9b44e1447ae02a2f9705d695a280059e;p=supertux.git diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp index e881933dc..4d1d75a27 100644 --- a/src/badguy/poisonivy.cpp +++ b/src/badguy/poisonivy.cpp @@ -24,13 +24,13 @@ #include "object/sprite_particle.hpp" PoisonIvy::PoisonIvy(const lisp::Lisp& reader) - : WalkingBadguy(reader, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right") + : WalkingBadguy(reader, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right") { walk_speed = 80; } PoisonIvy::PoisonIvy(const Vector& pos, Direction d) - : WalkingBadguy(pos, d, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right") + : WalkingBadguy(pos, d, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right") { walk_speed = 80; } @@ -44,7 +44,7 @@ PoisonIvy::write(lisp::Writer& writer) } bool -PoisonIvy::collision_squished(Player& player) +PoisonIvy::collision_squished(GameObject& object) { sprite->set_action(dir == LEFT ? "squished-left" : "squished-right"); // spawn some particles @@ -59,7 +59,7 @@ PoisonIvy::collision_squished(Player& player) Vector paccel = Vector(0, 100); Sector::current()->add_object(new SpriteParticle("images/objects/particles/poisonivy.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1)); } - kill_squished(player); + kill_squished(object); return true; }