X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fkugelblitz.hpp;h=b16999769da956fc30c3e2cbb8220bd71523cd8f;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=5e591207ba12b8962904b7f0e9df20576cd0585e;hpb=43b2b952c4dd04d873d2fc92028ebeffdc22c05b;p=supertux.git

diff --git a/src/badguy/kugelblitz.hpp b/src/badguy/kugelblitz.hpp
index 5e591207b..b16999769 100644
--- a/src/badguy/kugelblitz.hpp
+++ b/src/badguy/kugelblitz.hpp
@@ -1,7 +1,7 @@
-//  $Id: jumpy.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2005 Marek Moeckel <wansti@gmx.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,25 +12,26 @@
 //  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 __KUGELBLITZ_H__
 #define __KUGELBLITZ_H__
 
 #include "badguy.hpp"
 #include "timer.hpp"
+#include "object/electrifier.hpp"
 
 class Kugelblitz : public BadGuy
 {
 public:
   Kugelblitz(const lisp::Lisp& reader);
 
-  void activate();
+  void initialize();
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
   void write(lisp::Writer& writer);
@@ -38,16 +39,18 @@ public:
   void kill_fall();
   void explode();
 
+  virtual Kugelblitz* clone() const { return new Kugelblitz(*this); }
+
 private:
+  void try_activate();
   HitResponse hit(const CollisionHit& hit);
   Vector pos_groundhit;
   bool groundhit_pos_set;
   bool dying;
   Timer movement_timer;
   Timer lifetime;
-  Timer electrify_timer;
   int direction;
+  State state;
 };
 
 #endif
-