* svn:ignored .externalToolBuilders in root directory (Eclipse+CDT)

[supertux.git] / src / badguy / bomb.h

diff --git a/src/badguy/bomb.h b/src/badguy/bomb.h
index fc3beec..4bd3222 100644 (file)
--- 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__
 
@@ -11,12 +31,14 @@ public:
   void write(lisp::Writer& writer);
   HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
-  void active_action(float elapsed_time);
+  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
+  void active_update(float elapsed_time);
   void kill_fall();
+  void explode();
 
 private:
   int state;
-  Timer2 timer;
+  Timer timer;
 };
 
 #endif