X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmriceblock.hpp;h=ddf3847aa48e8b836ff8ed60682b35582f55f74e;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=a00c5e734c00f70f20645678f10351ee0dd1f4de;hpb=22ebbf03379aad8d3fc704e47e6cfa7acca8651d;p=supertux.git diff --git a/src/badguy/mriceblock.hpp b/src/badguy/mriceblock.hpp index a00c5e734..ddf3847aa 100644 --- a/src/badguy/mriceblock.hpp +++ b/src/badguy/mriceblock.hpp @@ -29,7 +29,7 @@ public: MrIceBlock(const lisp::Lisp& reader); MrIceBlock(const Vector& pos, Direction d); - void activate(); + void initialize(); void write(lisp::Writer& writer); HitResponse collision(GameObject& object, const CollisionHit& hit); void collision_solid(const CollisionHit& hit); @@ -60,6 +60,7 @@ private: void set_state(IceState state); IceState ice_state; + Timer nokick_timer; Timer flat_timer; int squishcount; };