Massive copyright update. I'm sorry if I'm crediting Matze for something he didn...

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

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index 614bb18..ac8491f 100644 (file)
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.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,15 +12,14 @@
 //  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.
 
 #include <config.h>
 
-#include "bomb.h"
+#include "bomb.hpp"
 
 static const float TICKINGTIME = 1;
 static const float EXPLOSIONTIME = 1;
@@ -30,11 +29,14 @@ Bomb::Bomb(const Vector& pos, Direction dir)
   start_position = pos;
   bbox.set_pos(pos);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("bomb");
-  state = 0;
+  sprite = sprite_manager->create("images/creatures/mr_bomb/bomb.sprite");
+  state = STATE_TICKING;
   timer.start(TICKINGTIME);
   this->dir = dir;
   sprite->set_action(dir == LEFT ? "ticking-left" : "ticking-right");
+  countMe = false;
+
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 void
@@ -55,7 +57,7 @@ Bomb::collision_solid(GameObject& , const CollisionHit& hit)
 HitResponse
 Bomb::collision_player(Player& player, const CollisionHit& )
 {
-  if(state == 1) {
+  if(state == STATE_EXPLODING) {
     player.kill(Player::SHRINK);
   }
   return ABORT_MOVE;
@@ -64,21 +66,21 @@ Bomb::collision_player(Player& player, const CollisionHit& )
 HitResponse
 Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& )
 {
-  if(state == 1)
+  if(state == STATE_EXPLODING)
     badguy.kill_fall();
   return ABORT_MOVE;
 }
 
 void
-Bomb::active_action(float )
+Bomb::active_update(float )
 {
   switch(state) {
-    case 0:
+    case STATE_TICKING:
       if(timer.check()) {
         explode();
       }
       break;
-    case 1:
+    case STATE_EXPLODING:
       if(timer.check()) {
         remove_me();
       }
@@ -89,16 +91,17 @@ Bomb::active_action(float )
 void
 Bomb::explode()
 {
-  state = 1;
+  state = STATE_EXPLODING;
+  set_group(COLGROUP_TOUCHABLE);
   sprite->set_action("explosion");
-  sound_manager->play_sound("explosion", get_pos(),
-                            Sector::current()->player->get_pos());
+  sound_manager->play("sounds/explosion.wav", get_pos());
   timer.start(EXPLOSIONTIME);
 }
 
 void
 Bomb::kill_fall()
 {
-  explode();
+  if (state != STATE_EXPLODING)  // we don't want it exploding again
+    explode();
 }