projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
added some more non-45 degree triangle modes
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
cf945e4
..
3f5bb93
100644
(file)
--- a/
src/player.cpp
+++ b/
src/player.cpp
@@
-857,10
+857,6
@@
Player::draw(DrawingContext& context)
HitResponse
Player::collision(GameObject& other, const CollisionHit& hit)
{
- if(dying) {
- return FORCE_MOVE;
- }
-
if(other.get_flags() & FLAG_SOLID) {
if(hit.normal.y < 0) { // landed on floor?
if (physic.get_velocity_y() < 0)