Mercurial > scrounge

changeset 36:e96056af61ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
monsters block before things
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Tue, 23 Aug 2011 20:36:47 +0200
parents 258867e11432
children 98e5639fa00b
files level.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/level.py	Tue Aug 23 19:13:56 2011 +0200
+++ b/level.py	Tue Aug 23 20:36:47 2011 +0200
@@ -112,11 +112,11 @@
             self.monsters[(m.x, m.y)] = m
 
     def is_blocked(self, x, y):
+        if (x, y) in self.monsters:
+            return self.monsters[(x, y)]
         t = self.things.get((x, y))
         if t and t.blocks:
             return t
-        if (x, y) in self.monsters:
-            return self.monsters[(x, y)]
         if x<0 or y<0:
             return True
         try: