X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.hpp;h=3e93c4f58583f1a451ad526462caf9cab7f6b92c;hb=35f17b8b7e5e0bafca3a34550fa300db704aedaa;hp=33d7e2c8d56f778f52293b52538c436543bbd837;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/poisonivy.hpp b/src/badguy/poisonivy.hpp
index 33d7e2c8d..3e93c4f58 100644
--- a/src/badguy/poisonivy.hpp
+++ b/src/badguy/poisonivy.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,29 +12,24 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __POISONIVY_H__
-#define __POISONIVY_H__
+#ifndef HEADER_SUPERTUX_BADGUY_POISONIVY_HPP
+#define HEADER_SUPERTUX_BADGUY_POISONIVY_HPP
 
-#include "badguy.hpp"
+#include "badguy/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 Reader& reader);
+  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);
-  
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;  
+  bool collision_squished(GameObject& object);
+
 };
 
 #endif
+
+/* EOF */