Fix bug in text box widget and multiline strings with markup

[naja.git] / naja / gamestate.py

diff --git a/naja/gamestate.py b/naja/gamestate.py
index c812c564e2e9c06be35a346f08eddb178af5612b..134fba3bad70649c1ed39b6bc08c1c2b535839d0 100644 (file)
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -18,11 +18,17 @@ class GameState(object):
     Naja game state.
     """
 
-    def __init__(self):
-        # This is a very simple deck to allow testing more drawing logic
-        # on tiles. These will need to be replaced with better stuff.
-        self.gameboard = GameBoard.new_game(
-            locations_definition=load_location_deck('test'))
+    def __init__(self, gameboard):
+        self.gameboard = gameboard
+
+    @classmethod
+    def new(cls, **kw):
+        locations_deck = load_location_deck('standard')
+        return cls(GameBoard.new_game(locations_deck['cards'], **kw))
+
+    @classmethod
+    def load(cls, data):
+        return cls(GameBoard.import_game(data))
 
     @property
     def player(self):