X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.cpp;h=742ec4a7b66790ab14379281510f83fca8a50807;hb=12a28b64dcce9c7ff706451b4f3aecd201cc8a5f;hp=e881933dc1ae96c03245f5d46bbb929768868a2a;hpb=ff59adfe9b44e1447ae02a2f9705d695a280059e;p=supertux.git

diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp
index e881933dc..742ec4a7b 100644
--- a/src/badguy/poisonivy.cpp
+++ b/src/badguy/poisonivy.cpp
@@ -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,37 +12,30 @@
 //  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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "poisonivy.hpp"
-#include "random_generator.hpp"
+#include "badguy/poisonivy.hpp"
+#include "math/random_generator.hpp"
 #include "object/sprite_particle.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
-PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
-	: WalkingBadguy(reader, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right")
+#include <math.h>
+
+PoisonIvy::PoisonIvy(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right")
 {
   walk_speed = 80;
 }
 
 PoisonIvy::PoisonIvy(const Vector& pos, Direction d)
-	: WalkingBadguy(pos, d, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right")
+  : WalkingBadguy(pos, d, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right")
 {
   walk_speed = 80;
 }
 
-void
-PoisonIvy::write(lisp::Writer& writer)
-{
-  writer.start_list("poisonivy");
-  WalkingBadguy::write(writer);
-  writer.end_list("poisonivy");
-}
-
 bool
-PoisonIvy::collision_squished(Player& player)
+PoisonIvy::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
   // spawn some particles
@@ -59,8 +50,10 @@ PoisonIvy::collision_squished(Player& player)
     Vector paccel = Vector(0, 100);
     Sector::current()->add_object(new SpriteParticle("images/objects/particles/poisonivy.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
   }
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
-IMPLEMENT_FACTORY(PoisonIvy, "poisonivy")
+IMPLEMENT_FACTORY(PoisonIvy, "poisonivy");
+
+/* EOF */