Update of /cvsroot/super-tux/supertux/src/badguy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19458/src/badguy
Modified Files:
bomb.cpp mrbomb.cpp
Log Message:
incorporated another patch from Ondra Hosek which fixes tux not getting killed on timeup, and adds sound to bomb again. Additionally fixed mrbomb not getting squishsound when jumped on and ticking bombs already killing enemies
Index: bomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/bomb.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bomb.cpp 29 Nov 2004 00:12:24 -0000 1.5
+++ bomb.cpp 1 Dec 2004 15:58:38 -0000 1.6
@@ -44,7 +44,8 @@
HitResponse
Bomb::collision_badguy(BadGuy& badguy, const CollisionHit& )
{
- badguy.kill_fall();
+ if(state == 1)
+ badguy.kill_fall();
return ABORT_MOVE;
}
@@ -56,6 +57,8 @@
if(timer.check()) {
state = 1;
sprite->set_action("explosion");
+ SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), get_pos(),
+ Sector::current()->player->get_pos());
timer.start(EXPLOSIONTIME);
}
break;
Index: mrbomb.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/mrbomb.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mrbomb.cpp 29 Nov 2004 00:12:24 -0000 1.8
+++ mrbomb.cpp 1 Dec 2004 15:58:38 -0000 1.9
@@ -48,7 +48,7 @@
{
remove_me();
Sector::current()->add_object(new Bomb(get_pos(), dir));
- player.bounce(*this);
+ kill_squished(player);
return true;
}
|
