Merge branch 'master' of hongabar.org:robotgame

robotgame/block.py

@@ -51,6 +51,6 @@ class Block(worldobject.WorldObject):
 
     def draw(self, window):
         window.blit(self.img, (self.x - 32 - self.level.camera_x,
-                               self.y - self.img.get_size()[1]
+                               self.y - self.img.get_size()[1] + 24
                                - self.level.camera_y))
 

robotgame/game.py

@@ -106,7 +106,7 @@ class Game(object):
         """
         Draw all game objects.
         """
-        self.window.fill((0, 255, 255))
+        self.window.fill((0, 0, 0))
         for obj in self.objs:
             if hasattr(obj, 'draw'):
                 obj.draw(self.window)

robotgame/player.py

@@ -82,8 +82,6 @@ class Player(worldobject.WorldObject):
                 obj.use(self)
 
     def update(self, e, t, dt):
-        worldobject.WorldObject.update(self, e, t, dt)
-
         for event in e:
             if event.type == pygame.KEYDOWN:
                 if event.key == pygame.K_UP:
@@ -114,6 +112,8 @@ class Player(worldobject.WorldObject):
         self.frame = ((self.frame + self.anim_speed * dt) %
                       len(self.imgs[self.anim]))
 
+        worldobject.WorldObject.update(self, e, t, dt)
+
     def draw(self, window):
         self.img = self.imgs[self.anim][int(self.frame)]
         self.img.set_alpha(128)