Mercurial > skaapsteker

changeset 84:6de531d648c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Exclude scenery sprites from collision detection.
author Jeremy Thurgood <firxen@gmail.com>
date Mon, 04 Apr 2011 14:01:49 +0200
parents 07a2ae603bdd
children 6e8cfd6fcd63
files skaapsteker/physics.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/physics.py	Mon Apr 04 13:27:09 2011 +0200
+++ b/skaapsteker/physics.py	Mon Apr 04 14:01:49 2011 +0200
@@ -98,7 +98,7 @@
         self._all.add(sprite)
         if sprite.mobile:
             self._mobiles.add(sprite)
-        else:
+        elif (sprite.floor or sprite.block):
             self._immobiles.add(sprite)
         if sprite.gravitates:
             self._gravitators.add(sprite)
@@ -130,7 +130,7 @@
                 if id(sprite1) < id(sprite2) and spritecollide(sprite2):
                     collide((sprite1, sprite2))
             for sprite2 in self._immobiles.sprites():
-                if (sprite2.floor or sprite2.block) and spritecollide(sprite2):
+                if spritecollide(sprite2):
                     collide((sprite1, sprite2))
         self.dispatch_collisions(collisions)