projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
85b5949
)
Prevent crash when tux dies while carrying iceblock.
author
Wolfgang Becker
<uafr@gmx.de>
Sun, 14 May 2006 12:43:58 +0000
(12:43 +0000)
committer
Wolfgang Becker
<uafr@gmx.de>
Sun, 14 May 2006 12:43:58 +0000
(12:43 +0000)
SVN-Revision: 3517
src/object/player.cpp
patch
|
blob
|
history
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
de69797
..
eefc7bb
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-190,7
+190,7
@@
Player::update(float elapsed_time)
movement = physic.get_movement(elapsed_time);
- if(grabbed_object != 0) {
+ if(grabbed_object != 0
&& !dying
) {
Vector pos = get_pos() +
Vector(dir == LEFT ? -16 : 16,
bbox.get_height()*0.66666 - 32);