X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fpoisonivy.cpp;h=3347465576df7aa3607ba9a72936c71c0a75127a;hb=dcd6b92996ea0767156f862be11498f1bd44e7c1;hp=2a6aeb791a802b94caa65ffee8a78c8a5780edad;hpb=058e2f6298d8319c0fe03c5e950a36a8f1f57aba;p=supertux.git

diff --git a/src/badguy/poisonivy.cpp b/src/badguy/poisonivy.cpp
index 2a6aeb791..334746557 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,40 +12,28 @@
 //  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 "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "sector.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
 #include <math.h>
 
-PoisonIvy::PoisonIvy(const lisp::Lisp& reader)
-        : WalkingBadguy(reader, "images/creatures/poison_ivy/poison_ivy.sprite", "left", "right")
+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(GameObject& object)
 {
@@ -56,8 +42,8 @@ PoisonIvy::collision_squished(GameObject& object)
   // TODO: provide convenience function in MovingSprite or MovingObject?
   for (int i = 0; i < 3; i++) {
     Vector ppos = bbox.get_middle();
-    float angle = systemRandom.randf(-M_PI_2, M_PI_2);
-    float velocity = systemRandom.randf(350, 400);
+    float angle = graphicsRandom.randf(-M_PI_2, M_PI_2);
+    float velocity = graphicsRandom.randf(350, 400);
     float vx = sin(angle)*velocity;
     float vy = -cos(angle)*velocity;
     Vector pspeed = Vector(vx, vy);
@@ -68,4 +54,4 @@ PoisonIvy::collision_squished(GameObject& object)
   return true;
 }
 
-IMPLEMENT_FACTORY(PoisonIvy, "poisonivy")
+/* EOF */