projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57d33b3
)
fix from Tron so player doesn't get hurt by eggs
author
Matthias Braun
<matze@braunis.de>
Sun, 13 Aug 2006 13:09:32 +0000
(13:09 +0000)
committer
Matthias Braun
<matze@braunis.de>
Sun, 13 Aug 2006 13:09:32 +0000
(13:09 +0000)
SVN-Revision: 4175
src/object/player.cpp
patch
|
blob
|
history
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
5128efa
..
df2ca01
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-202,7
+202,7
@@
Player::adjust_height(float new_height)
if(new_height > bbox.get_height()) {
Rect additional_space = bbox2;
additional_space.set_height(new_height - bbox.get_height());
- if(!Sector::current()->is_free_of_
moving
statics(additional_space, this))
+ if(!Sector::current()->is_free_of_statics(additional_space, this))
return false;
}