projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed MrTree. He uses activate() to change direction which is now working again.
[supertux.git]
/
src
/
badguy
/
rocketexplosion.cpp
diff --git
a/src/badguy/rocketexplosion.cpp
b/src/badguy/rocketexplosion.cpp
index
c5f32aa
..
dcc6120
100644
(file)
--- a/
src/badguy/rocketexplosion.cpp
+++ b/
src/badguy/rocketexplosion.cpp
@@
-24,11
+24,8
@@
static const float EXPLOSIONTIME = 1;
RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
static const float EXPLOSIONTIME = 1;
RocketExplosion::RocketExplosion(const Vector& pos, Direction dir)
+ : BadGuy(pos, "images/creatures/mr_rocket/explosion.sprite")
{
{
- start_position = pos;
- bbox.set_pos(pos);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("images/creatures/mr_rocket/explosion.sprite");
this->dir = dir;
countMe = false;
explode();
this->dir = dir;
countMe = false;
explode();
@@
-52,7
+49,7
@@
RocketExplosion::collision_solid(GameObject& , const CollisionHit& hit)
HitResponse
RocketExplosion::collision_player(Player& player, const CollisionHit& )
{
HitResponse
RocketExplosion::collision_player(Player& player, const CollisionHit& )
{
- player.kill(
Player::SHRINK
);
+ player.kill(
false
);
return ABORT_MOVE;
}
return ABORT_MOVE;
}