projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c71d003
)
remove fireball when hitting badguy
author
Wolfgang Becker
<uafr@gmx.de>
Wed, 12 Jul 2006 12:49:33 +0000
(12:49 +0000)
committer
Wolfgang Becker
<uafr@gmx.de>
Wed, 12 Jul 2006 12:49:33 +0000
(12:49 +0000)
SVN-Revision: 3987
src/badguy/badguy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
533a6ae
..
bd4913c
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-237,8
+237,9
@@
BadGuy::collision_squished(Player& )
}
HitResponse
-BadGuy::collision_bullet(Bullet& , const CollisionHit& )
+BadGuy::collision_bullet(Bullet&
bullet
, const CollisionHit& )
{
+ bullet.remove_me();
kill_fall();
return ABORT_MOVE;
}