Mercurial > skaapsteker

changeset 398:6850a3ab3aac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove redundant check
author Neil Muller <drnlmuller@gmail.com>
date Sat, 09 Apr 2011 16:40:01 +0200
parents 00dbc053f9a0
children 488ab520408c
files skaapsteker/sprites/player.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/player.py	Sat Apr 09 16:54:11 2011 +0200
+++ b/skaapsteker/sprites/player.py	Sat Apr 09 16:40:01 2011 +0200
@@ -136,8 +136,7 @@
                     continue
                 clip = obj.collide_rect.clip(self.collide_rect)
                 clip_area += clip.width * clip.height
-                if (obj.floor or obj.block) and \
-                        clip.width > TILE_SIZE[0] / 2 and \
+                if clip.width > TILE_SIZE[0] / 2 and \
                         self.collide_rect.bottom < obj.collide_rect.top + TILE_SIZE[1] / 3:
                    delta = self.rect.bottom - self.collide_rect.bottom
                    self.collide_rect.bottom = obj.collide_rect.top - 1