projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Do not resurrect squished bouncing snowball when colliding with badguy or tile
[supertux.git]
/
src
/
badguy
/
bouncing_snowball.cpp
diff --git
a/src/badguy/bouncing_snowball.cpp
b/src/badguy/bouncing_snowball.cpp
index
64f49f7
..
67af264
100644
(file)
--- a/
src/badguy/bouncing_snowball.cpp
+++ b/
src/badguy/bouncing_snowball.cpp
@@
-50,6
+50,11
@@
BouncingSnowball::collision_squished(GameObject& object)
void
BouncingSnowball::collision_solid(const CollisionHit& hit)
{
+ if(sprite->get_action() == "squished")
+ {
+ return;
+ }
+
if(hit.bottom) {
if(get_state() == STATE_ACTIVE) {
physic.set_velocity_y(JUMPSPEED);