X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fplant.hpp;h=97aea8b67855bb7743e32f371a369739e838adb9;hb=7a6f00e27bdc0aac2107506c3b00cbf0bf1cccc5;hp=ab0dfd5bb8a274f4e38e3014f17601e80faf83e6;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git diff --git a/src/badguy/plant.hpp b/src/badguy/plant.hpp index ab0dfd5bb..97aea8b67 100644 --- a/src/badguy/plant.hpp +++ b/src/badguy/plant.hpp @@ -27,9 +27,9 @@ class Plant : public BadGuy public: Plant(const lisp::Lisp& reader); - void activate(); + void initialize(); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); + void collision_solid(const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void active_update(float elapsed_time); @@ -44,7 +44,7 @@ protected: PLANT_WALKING }; PlantState state; - + }; #endif