projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stalactites interact with badguys again.
[supertux.git]
/
src
/
badguy
/
badguy.cpp
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
ae6c39f
..
8d9ae8c
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-163,8
+163,17
@@
BadGuy::inactive_update(float )
void
BadGuy::collision_tile(uint32_t tile_attributes)
{
void
BadGuy::collision_tile(uint32_t tile_attributes)
{
- if(tile_attributes & Tile::HURTS)
- kill_fall();
+ if(tile_attributes & Tile::HURTS) {
+ if (tile_attributes & Tile::FIRE) {
+ if (is_flammable()) ignite();
+ }
+ else if (tile_attributes & Tile::ICE) {
+ if (is_freezable()) freeze();
+ }
+ else {
+ kill_fall();
+ }
+ }
}
HitResponse
}
HitResponse