projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*possible* fix for bugs #453 and #373
[supertux.git]
/
src
/
badguy
/
mrbomb.cpp
diff --git
a/src/badguy/mrbomb.cpp
b/src/badguy/mrbomb.cpp
index
0526c95
..
1ed8240
100644
(file)
--- a/
src/badguy/mrbomb.cpp
+++ b/
src/badguy/mrbomb.cpp
@@
-21,15
+21,20
@@
#include "mrbomb.hpp"
#include "bomb.hpp"
#include "mrbomb.hpp"
#include "bomb.hpp"
+#include "object/explosion.hpp"
#include "sprite/sprite_manager.hpp"
#include "sprite/sprite_manager.hpp"
+#include "audio/sound_manager.hpp"
MrBomb::MrBomb(const lisp::Lisp& reader)
MrBomb::MrBomb(const lisp::Lisp& reader)
-
: WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
+ : WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
{
walk_speed = 80;
{
walk_speed = 80;
- max_drop_height =
0
;
+ max_drop_height =
16
;
grabbed = false;
grabbed = false;
+ //Prevent stutter when Tux jumps on Mr Bomb
+ sound_manager->preload("sounds/explosion.wav");
+
//Check if we need another sprite
if( !reader.get( "sprite", sprite_name ) ){
return;
//Check if we need another sprite
if( !reader.get( "sprite", sprite_name ) ){
return;
@@
-42,13
+47,14
@@
MrBomb::MrBomb(const lisp::Lisp& reader)
sprite = sprite_manager->create( sprite_name );
}
sprite = sprite_manager->create( sprite_name );
}
-/* MrBomb created by a d
espenc
er always gets default sprite atm.*/
+/* MrBomb created by a d
ispens
er always gets default sprite atm.*/
MrBomb::MrBomb(const Vector& pos, Direction d)
MrBomb::MrBomb(const Vector& pos, Direction d)
-
: WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
+ : WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
{
walk_speed = 80;
{
walk_speed = 80;
- max_drop_height =
0
;
+ max_drop_height =
16
;
grabbed = false;
grabbed = false;
+ sound_manager->preload("sounds/explosion.wav");
}
void
}
void
@@
-76,11
+82,11
@@
MrBomb::collision_player(Player& player, const CollisionHit& hit)
}
bool
}
bool
-MrBomb::collision_squished(
Player& player
)
+MrBomb::collision_squished(
GameObject& object
)
{
remove_me();
Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
{
remove_me();
Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
- kill_squished(
player
);
+ kill_squished(
object
);
return true;
}
return true;
}
@@
-96,9
+102,10
@@
void
MrBomb::kill_fall()
{
remove_me();
MrBomb::kill_fall()
{
remove_me();
- Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
- Sector::current()->add_object(bomb);
- bomb->explode();
+ Explosion* explosion = new Explosion(get_bbox().get_middle());
+ Sector::current()->add_object(explosion);
+
+ run_dead_script();
}
void
}
void
@@
-108,7
+115,7
@@
MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
movement = pos - get_pos();
this->dir = dir;
sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
movement = pos - get_pos();
this->dir = dir;
sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
- set_
group
(COLGROUP_DISABLED);
+ set_
colgroup_active
(COLGROUP_DISABLED);
grabbed = true;
}
grabbed = true;
}
@@
-116,7
+123,7
@@
void
MrBomb::ungrab(MovingObject& , Direction dir)
{
this->dir = dir;
MrBomb::ungrab(MovingObject& , Direction dir)
{
this->dir = dir;
- set_
group
(COLGROUP_MOVING);
+ set_
colgroup_active
(COLGROUP_MOVING);
grabbed = false;
}
grabbed = false;
}