projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Changed collision code, we now have several collision groups:
[supertux.git]
/
src
/
object
/
player.cpp
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
aee2daa
..
2adc8bf
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-750,7
+750,7
@@
Player::kill(HurtMode mode)
player_status->bonus = NO_BONUS;
dying = true;
dying_timer.start(3.0);
-
flags |= FLAG_NO_COLLDET
;
+
set_group(COLGROUP_DISABLED)
;
}
}