X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=934aa3d15b1d308cb12d59d37e6e5d1645a0deae;hb=51c21cef44d0a7f3cb59f4a005d4a1dba9159d51;hp=9855546c905a0a96019ecd60861132400cbbe7b6;hpb=a12dd14b0afd356c09480a2b5b2b82e9c35425be;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index 9855546..934aa3d 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -7,6 +7,7 @@ from naja.options import options
 from naja.player import Player
 from naja import actions
 from naja.sound import sound
+from naja.utils import parse_bits
 import random
 
 
@@ -85,7 +86,9 @@ class GameBoard(object):
         player = Player.import_player(state.pop('player'))
         board_locations = cls.import_board_locations(
             state.pop('board_locations'))
-        return cls(state, player, board_locations)
+        board = cls(state, player, board_locations)
+        player.set_gameboard(board)
+        return board
 
     def export(self):
         data = {
@@ -315,14 +318,14 @@ class LocationCard(object):
     @classmethod
     def build_action(cls, definition):
         action_class = getattr(actions, definition['action_class'])
-        required_bits = cls.parse_bits(definition['required_bits'])
+        required_bits = parse_bits(definition['required_bits'])
         data = definition.get('data', {})
         return action_class(required_bits, **data)
 
     @classmethod
     def new_location(cls, definition, replacement_params=None, puzzle=False):
         if 'bits' in definition:
-            bits = cls.parse_bits(definition['bits'])
+            bits = parse_bits(definition['bits'])
         else:
             bits = cls.generate_bitwise_operand()
 
@@ -345,11 +348,6 @@ class LocationCard(object):
             location.check_actions()
         return location
 
-    @classmethod
-    def parse_bits(self, bit_list):
-        # Convert names to numbers if applicable.
-        return frozenset(BITS.get(bit, bit) for bit in bit_list)
-
     def export(self):
         return {
             'bitwise_operand': sorted(self.bitwise_operand),