CaptainSnowball uses his ability to jump more often

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

diff --git a/src/badguy/poisonivy.hpp b/src/badguy/poisonivy.hpp
index 7a34a22..783f232 100644 (file)
--- a/src/badguy/poisonivy.hpp
+++ b/src/badguy/poisonivy.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,32 +12,28 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __POISONIVY_H__
 #define __POISONIVY_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
 
-class PoisonIvy : public BadGuy
+class PoisonIvy : public WalkingBadguy
 {
 public:
   PoisonIvy(const lisp::Lisp& reader);
-  PoisonIvy(float pos_x, float pos_y, Direction d);
+  PoisonIvy(const Vector& pos, Direction d);
 
-  void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-  
+  virtual PoisonIvy* clone() const { return new PoisonIvy(*this); }
+
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;  
+  bool collision_squished(GameObject& object);
+
 };
 
 #endif