X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=09fd099f0a258d7d5136d590318512b4f7ca72f9;hb=83850d913f756713d0e82c768147a018e2dcc84d;hp=b6e219bd0305a68a090f149b5b6301178aa95da5;hpb=7ba98383908eb9546ee78a14dad90057dc65757b;p=naja.git

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index b6e219b..09fd099 100644
--- a/naja/widgets/robot.py
+++ b/naja/widgets/robot.py
@@ -1,18 +1,16 @@
 """Widget to draw the player on the screen"""
 
-import pygame.locals as pgl
-
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
-from naja.events import InvalidateTheWorld
+from naja.constants import (PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS)
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
 
 IMG_MAP = {
-        BITS.CYAN: 'board/robot_cyan.png',
-        BITS.YELLOW: 'board/robot_yellow.png',
-        BITS.MAGENTA: 'board/robot_magenta.png',
-        }
+    BITS.MSB: 'board/robot_msb.png',
+    BITS.RED: 'board/robot_red.png',
+    BITS.GREEN: 'board/robot_green.png',
+    BITS.BLUE: 'board/robot_blue.png',
+}
 
 
 class RobotWidget(Widget):
@@ -28,7 +26,7 @@ class RobotWidget(Widget):
         self.pos = (self.state.player.position[0] * TILE_SIZE[0],
                     self.state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
         self.surface = resources.get_image('board/robot.png',
-                                           transforms=(EIGHT_BIT,))
+                                           transforms=(EIGHT_BIT,)).copy()
         for bit, img_name in IMG_MAP.iteritems():
             if self.state.player.bits.check_bit(bit):
                 bit_img = resources.get_image(img_name,
@@ -37,23 +35,3 @@ class RobotWidget(Widget):
 
     def draw(self, surface):
         surface.blit(self.surface, self.rect)
-
-    def handle_event(self, ev):
-        if ev.type == pgl.KEYDOWN:
-            if ev.key in (pgl.K_UP, pgl.K_w):
-                if self.state.player.move(BITS.NORTH):
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_DOWN, pgl.K_s):
-                if self.state.player.move(BITS.SOUTH):
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_LEFT, pgl.K_a):
-                if self.state.player.move(BITS.WEST):
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_RIGHT, pgl.K_d):
-                if self.state.player.move(BITS.EAST):
-                    InvalidateTheWorld.post()
-                    return True
-        super(RobotWidget, self).handle_event(ev)