X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.h;h=54ec05d3f29149dd9b4b5a85a4d8e042c85deaec;hb=7bbb0ef907ebec48718560425a0147b31307f7fd;hp=7275c0ee2ee8b03a0b4f2a37a8adcae6e45bd7fc;hpb=f41a5719a2dc1a50674c69fa511c38a152cc4b03;p=supertux.git diff --git a/src/badguy/mriceblock.h b/src/badguy/mriceblock.h index 7275c0ee2..54ec05d3f 100644 --- a/src/badguy/mriceblock.h +++ b/src/badguy/mriceblock.h @@ -6,12 +6,13 @@ class MrIceBlock : public BadGuy { public: - MrIceBlock(LispReader& reader); + MrIceBlock(const lisp::Lisp& reader); MrIceBlock(float pos_x, float pos_y, Direction d); void activate(); - void write(LispWriter& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + void write(lisp::Writer& writer); + HitResponse collision_solid(GameObject& object, const CollisionHit& hit); + HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void active_action(float elapsed_time);