merged new collision detection branch back into mainline

[supertux.git] / src / badguy / plant.hpp

diff --git a/src/badguy/plant.hpp b/src/badguy/plant.hpp
index ab0dfd5..75d77e3 100644 (file)
--- a/src/badguy/plant.hpp
+++ b/src/badguy/plant.hpp
@@ -29,7 +29,7 @@ public:
 
   void activate();
   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);