X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=8d9ae8cc427fec97563fc6e5d8fc68615902b669;hb=e58a0205a8836820b53a7b875942bae7b0e629fd;hp=ae6c39f62c29d7faddc970c7c7a62fd83c321aaa;hpb=30f0f1d78e3f0bbbaf0b8d9d80fcbb579059941e;p=supertux.git

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index ae6c39f62..8d9ae8cc4 100644
--- 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)
 {
-  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