X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.h;h=edb69f999887d54b1e0a40f21a39b51d8efd54f4;hb=249a05a552937aca73d54888d3c2ca6d6fec0080;hp=9d095993082afc8563c1db241a66da6f528ef4c5;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/badguy/bomb.h b/src/badguy/bomb.h
index 9d0959930..edb69f999 100644
--- a/src/badguy/bomb.h
+++ b/src/badguy/bomb.h
@@ -1,3 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 distributed in the hope that it will be useful,
+//  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.
+
 #ifndef __BOMB_H__
 #define __BOMB_H__
 
@@ -8,15 +28,17 @@ class Bomb : public BadGuy
 public:
   Bomb(const Vector& pos, Direction dir);
 
-  void write(LispWriter& writer);
+  void write(lisp::Writer& writer);
   HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_action(float elapsed_time);
   void kill_fall();
+  void explode();
 
 private:
   int state;
-  Timer2 timer;
+  Timer timer;
 };
 
 #endif