X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=09fd099f0a258d7d5136d590318512b4f7ca72f9;hb=232e58a7d1432a6d3d13001c5675e64c5cccd982;hp=7e218a93a7451291fa662b57508dfc09bb5e537a;hpb=85f20ca165c1710c96afbc42fa07acb68b6b4c1d;p=naja.git

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index 7e218a9..09fd099 100644
--- a/naja/widgets/robot.py
+++ b/naja/widgets/robot.py
@@ -1,33 +1,32 @@
 """Widget to draw the player on the screen"""
-import pygame
-import pygame.locals as pgl
 
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
+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):
     """Widget which holds a tile on the game board."""
     def __init__(self, state):
-        pos = (state.player.position[0] * TILE_SIZE[0] + 32,
+        pos = (state.player.position[0] * TILE_SIZE[0],
                state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
         super(RobotWidget, self).__init__(pos, PLAYER_SIZE)
         self.state = state
 
     def prepare(self):
         # Look up the required bits on the board location
-        self.pos = (self.state.player.position[0] * TILE_SIZE[0] + 32,
+        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,