Merge pull request #956 from NimbusBP1729/fish_cant_drown

allows fish to survive water
hawkthorne · Mar 10, 2013 · 48121e3 · 48121e3
2 parents 30276e7 + 5da078a
commit 48121e3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/nodes/liquid.lua b/src/nodes/liquid.lua
@@ -79,6 +79,7 @@ end
 function Liquid:collide(node, dt, mtv_x, mtv_y)
     if node.isEnemy then
         local enemy = node
+        if enemy.props.name == "fish" then return end
         if (self.death) or (self.drown and enemy.position.y >= self.position.y) then
             enemy:die()
         end