X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fboard.py;h=ac0ec886af225061790d75cb22fd4b2d5509b645;hb=a493894e2df2717c113687acf8f259cf6ee6e436;hp=e6eafa5e8a429468f39fcfe51b70927b68ef0160;hpb=c81c66c4be9f5e683e2dca82cc236d36be254d3b;p=naja.git

diff --git a/naja/widgets/board.py b/naja/widgets/board.py
index e6eafa5..ac0ec88 100644
--- a/naja/widgets/board.py
+++ b/naja/widgets/board.py
@@ -3,8 +3,8 @@ Widget that holds the game tiles.
 """
 import pygame.locals as pgl
 
-from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, ACT, FPS
-from naja.events import finish_event
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, FPS
+from naja.events import InvalidateTheWorld, finish_event
 from naja.sound import sound
 
 from naja.widgets.base import Widget
@@ -35,8 +35,6 @@ class BoardWidget(Widget):
             tile.set_highlight(self.card_pos, self.flash_light.on)
             tile.prepare()
         self.size = BOARD_SIZE
-        if self.state.gameboard.player_mode == ACT:
-            self.card_pos = self.state.player.position
 
     def draw(self, surface):
         if self.flash_light.tick():
@@ -46,8 +44,8 @@ class BoardWidget(Widget):
 
     def update_card_pos(self, card_pos):
         self.card_pos = card_pos
-        self.info.set_position(self.card_pos)
         self.legal = self.card_pos in self.state.player.legal_moves()
+        self.info.set_position(self.card_pos, legal=self.legal)
         sound.play_sound('zoop.ogg', volume=0.05)
 
     def change_pos(self, offset):
@@ -71,8 +69,8 @@ class BoardWidget(Widget):
             tile.animation = 0
 
     def handle_event(self, ev):
-        if self.state.gameboard.player_mode == ACT:
-            return super(BoardWidget, self).handle_event(ev)
+        if InvalidateTheWorld.matches(ev):
+            self.flash_light.reset()
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.UP:
                 if self.change_pos((0, -1)):
@@ -86,13 +84,4 @@ class BoardWidget(Widget):
             elif ev.key in KEYS.RIGHT:
                 if self.change_pos((+1, 0)):
                     return finish_event()
-            elif ev.key in KEYS.SWITCH:
-                self.next_viable_pos()
-                return finish_event()
-            elif ev.key in KEYS.SELECT:
-                if self.state.player.set_position(self.card_pos):
-                    self.state.gameboard.change_mode(ACT)
-                    self.info.set_position(self.card_pos)
-                    sound.play_sound('chirp.ogg', volume=0.5)
-                    return finish_event()
         return super(BoardWidget, self).handle_event(ev)