Fix gamestate setup.

[naja.git] / naja / gamestate.py

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 96e55056bf862b5243aed0198bd46e8a0ce097a7..dabf34a9c23311c6302d06242dc2688dce5d50b8 100644 (file)
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,8 @@
 The current game state.
 """
 
-from .constants import BITS
-from .gameboard import GameBoard
-from .player import Player
+from naja.constants import BITS
+from naja.gameboard import GameBoard
 
 
 class GameState(object):
@@ -20,6 +19,13 @@ class GameState(object):
     WINS_REQUIRED = 4
 
     def __init__(self):
-        self.player = Player(self.INITIAL_BITS, (0, 0))
-        self.gameboard = GameBoard(
-            self.player, self.MAX_HEALTH, self.WINS_REQUIRED)
+        self.gameboard = GameBoard.new_game(
+            initial_bits=self.INITIAL_BITS,
+            initial_pos=(2, 2),
+            max_health=self.MAX_HEALTH,
+            wins_required=self.WINS_REQUIRED,
+            locations_definition=[])  # TODO: we will need some of these :)
+
+    @property
+    def player(self):
+        return self.gameboard.player