fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index c7445a2..45fb892 100644 (file)
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -1,6 +1,25 @@
+//  $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.
 #include <config.h>
 
-#include "bomb.h"
+#include "bomb.hpp"
 
 static const float TICKINGTIME = 1;
 static const float EXPLOSIONTIME = 1;
@@ -10,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
@@ -35,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;
@@ -44,22 +66,21 @@ Bomb::collision_player(Player& player, const CollisionHit& )
 HitResponse
 Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& )
 {
-  badguy.kill_fall();
+  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()) {
-        state = 1;
-        sprite->set_action("explosion");
-        timer.start(EXPLOSIONTIME);
+        explode();
       }
       break;
-    case 1:
+    case STATE_EXPLODING:
       if(timer.check()) {
         remove_me();
       }
@@ -68,6 +89,19 @@ Bomb::active_action(float )
 }
 
 void
+Bomb::explode()
+{
+  state = STATE_EXPLODING;
+  set_group(COLGROUP_TOUCHABLE);
+  sprite->set_action("explosion");
+  sound_manager->play("sounds/explosion.wav", get_pos());
+  timer.start(EXPLOSIONTIME);
+}
+
+void
 Bomb::kill_fall()
 {
+  if (state != STATE_EXPLODING)  // we don't want it exploding again
+    explode();
 }
+