fade out console

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

diff --git a/src/badguy/kugelblitz.hpp b/src/badguy/kugelblitz.hpp
index 30f0b43..2d7ff70 100644 (file)
--- a/src/badguy/kugelblitz.hpp
+++ b/src/badguy/kugelblitz.hpp
@@ -22,6 +22,7 @@
 
 #include "badguy.hpp"
 #include "timer.hpp"
+#include "object/electrifier.hpp"
 
 class Kugelblitz : public BadGuy
 {
@@ -29,18 +30,25 @@ public:
   Kugelblitz(const lisp::Lisp& reader);
 
   void activate();
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
+  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  HitResponse collision_player(Player& player, const CollisionHit& hit);
 
   void write(lisp::Writer& writer);
   void active_update(float);
+  void kill_fall();
+  void explode();
 
 private:
+  void try_activate();
   HitResponse hit(const CollisionHit& hit);
   Vector pos_groundhit;
   bool groundhit_pos_set;
+  bool dying;
   Timer movement_timer;
+  Timer lifetime;
   int direction;
+  State state;
 };
 
 #endif