Boulder now ignores player and vice versa.

This commit is contained in:
Sakse Dalum
2012-08-09 15:22:42 +02:00
parent a69281f5e1
commit 0ff2f9df9a
3 changed files with 10 additions and 1 deletions

View File

@@ -41,6 +41,8 @@ class WorldObject(object):
self.holding = None
self.holder = None
self.ignore_list = []
self.is_currently_opaque = True
if hasattr(self, 'img'):
@@ -73,7 +75,8 @@ class WorldObject(object):
if (obj.x == self.x + move_x * self.tile_x
and obj.y == self.y + move_y * self.tile_y
and obj is not self and obj is not self.holder
and obj is not self.holding and obj.blocking):
and obj is not self.holding and obj.blocking
and type(obj) not in self.ignore_list):
return False
return True
return False