projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable collision detection when tux is falling down because he is dead
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
cba8829
..
cf945e4
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-870,8
+870,7
@@
Player::collision(GameObject& other, const CollisionHit& hit)
physic.set_velocity_y(.1);
}
physic.set_velocity_y(.1);
}
- if(fabsf(hit.normal.x) > .5) { // hit on the side?
- printf("s"); fflush(stdout);
+ if(fabsf(hit.normal.x) > .9) { // hit on the side?
physic.set_velocity_x(0);
}
physic.set_velocity_x(0);
}
@@
-933,6
+932,7
@@
Player::kill(HurtMode mode)
--player_status.lives;
dying = DYING_SQUISHED;
dying_timer.start(3.0);
--player_status.lives;
dying = DYING_SQUISHED;
dying_timer.start(3.0);
+ flags |= FLAG_NO_COLLDET;
}
}
}
}