projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ice fire destroys flame.
[supertux.git]
/
src
/
badguy.cpp
diff --git
a/src/badguy.cpp
b/src/badguy.cpp
index
5b762bb
..
8d26afb
100644
(file)
--- a/
src/badguy.cpp
+++ b/
src/badguy.cpp
@@
-1211,9
+1211,9
@@
BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
}
else if(pbullet_c->kind == ICE_BULLET)
{
}
else if(pbullet_c->kind == ICE_BULLET)
{
-
//
if(kind == BAD_FLAME)
-
//
kill_me(10);
-
//
else
+ if(kind == BAD_FLAME)
+ kill_me(10);
+ else
frozen_timer.start(FROZEN_TIME);
}
break;
frozen_timer.start(FROZEN_TIME);
}
break;