projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ecd2b11
)
Bugfix: ice blocks were hurting player when dropped.
author
Ricardo Cruz
<rick2@aeiou.pt>
Thu, 9 Sep 2004 20:44:32 +0000
(20:44 +0000)
committer
Ricardo Cruz
<rick2@aeiou.pt>
Thu, 9 Sep 2004 20:44:32 +0000
(20:44 +0000)
SVN-Revision: 1890
src/badguy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy.cpp
b/src/badguy.cpp
index
1303cb0
..
2dd2993
100644
(file)
--- a/
src/badguy.cpp
+++ b/
src/badguy.cpp
@@
-365,9
+365,9
@@
BadGuy::action_mriceblock(double elapsed_time)
if(tux.input.fire != DOWN) /* SHOOT! */
{
if(dir == LEFT)
- base.x
-= 24
;
+ base.x
= tux.base.x
;
else
- base.x
+= 24
;
+ base.x
= tux.base.x + tux.base.width
;
old_base = base;
mode=KICK;