X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=75082d061395512a96bf4e5bc0a6013363027c6c;hb=ba6874da203fc7eec66a6efffb9747a4f5706d86;hp=2653f815aef860b7bc7f06e40aa82d4ab76f457b;hpb=cd0b75b50d9db985634a4cf0b539fd327c11e325;p=naja.git

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index 2653f81..75082d0 100644
--- a/naja/widgets/robot.py
+++ b/naja/widgets/robot.py
@@ -2,8 +2,8 @@
 
 import pygame.locals as pgl
 
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT
-from naja.events import InvalidateTheWorld
+from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT, KEYS
+from naja.events import PlayerMoved, finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
@@ -28,7 +28,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,
@@ -42,28 +42,23 @@ class RobotWidget(Widget):
         if self.state.gameboard.player_mode == ACT:
             return super(RobotWidget, self).handle_event(ev)
         if ev.type == pgl.KEYDOWN:
-            if ev.key in (pgl.K_UP, pgl.K_w, pgl.K_COMMA):
+            if ev.key in KEYS.UP:
                 if self.state.player.move(BITS.NORTH):
                     self.state.gameboard.change_mode()
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_DOWN, pgl.K_s, pgl.K_o):
+                    return finish_event(events=[PlayerMoved])
+            if ev.key in KEYS.DOWN:
                 if self.state.player.move(BITS.SOUTH):
                     self.state.gameboard.change_mode()
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_LEFT, pgl.K_a):
+                    return finish_event(events=[PlayerMoved])
+            if ev.key in KEYS.LEFT:
                 if self.state.player.move(BITS.WEST):
                     self.state.gameboard.change_mode()
-                    InvalidateTheWorld.post()
-                    return True
-            if ev.key in (pgl.K_RIGHT, pgl.K_d, pgl.K_e):
+                    return finish_event(events=[PlayerMoved])
+            if ev.key in KEYS.RIGHT:
                 if self.state.player.move(BITS.EAST):
                     self.state.gameboard.change_mode()
-                    InvalidateTheWorld.post()
-                    return True
+                    return finish_event(events=[PlayerMoved])
             if ev.key in (pgl.K_SPACE,):
                 self.state.gameboard.change_mode()
-                InvalidateTheWorld.post()
-                return True
+                return finish_event()
         return super(RobotWidget, self).handle_event(ev)