projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a4db192
)
Fix for Yeti killing you when he jumps. (probably won't affect other badguys)
author
Mathnerd314
<man.is.allan@gmail.com>
Sat, 27 Feb 2010 12:57:54 +0000
(12:57 +0000)
committer
Mathnerd314
<man.is.allan@gmail.com>
Sat, 27 Feb 2010 12:57:54 +0000
(12:57 +0000)
SVN-Revision: 6415
src/badguy/badguy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
9e5c545
..
0b51f71
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-256,7
+256,7
@@
BadGuy::collision(GameObject& other, const CollisionHit& hit)
// hit from above?
if (player->get_bbox().p2.y < (bbox.p1.y + 16)) {
if(collision_squished(*player)) {
- return
ABORT
_MOVE;
+ return
FORCE
_MOVE;
}
}