projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved frozen behavior.
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
8734457
..
d285849
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-673,14
+673,12
@@
Player::collision(void* p_c_object, int c_object)
kill(SHRINK);
}
else
kill(SHRINK);
}
else
- {
- pbad_c->dying = DYING_FALLING;
- play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
- World::current()->add_score(pbad_c->base.x,
- pbad_c->base.y,
- 25 * player_status.score_multiplier);
- }
+ pbad_c->kill_me(20);
}
}
+ else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB
+ || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH
+ || pbad_c->kind == BAD_SPIKY))
+ pbad_c->kill_me(20);
else
{
if (!invincible_timer.started())
else
{
if (!invincible_timer.started())