We set defaults in new_game() don't pass parameters that aren't needed

diff --git a/naja/options.py b/naja/options.py
index 73129490cf7903e4796543968f13248495c97353..498a979d8ecae6299cbf4d5d280b89bd6bfb2a46 100644 (file)
--- a/naja/options.py
+++ b/naja/options.py
@@ -30,7 +30,7 @@ def load_deck(parser, deck):
     '''
     from naja.gamestate import GameState
     try:
     '''
     from naja.gamestate import GameState
     try:

-        state = GameState.new(deck=deck, max_health=4, wins_required=4)
+        state = GameState.new(deck=deck)

     except:
         if options.debug:
             raise
     except:
         if options.debug:
             raise

diff --git a/naja/scenes/puzzlelist.py b/naja/scenes/puzzlelist.py
index f9c51c1fa13b1a0dbddf5bc9126247ae1a7e1adb..670b6b15cad540f4c306ea5739b17225b832114c 100644 (file)
--- a/naja/scenes/puzzlelist.py
+++ b/naja/scenes/puzzlelist.py
@@ -48,11 +48,8 @@ class PuzzleListScene(Scene):
 
     def start_puzzle_game(self, event, puzzle=None, deck=None):
         from naja.scenes.game import GameScene
 
     def start_puzzle_game(self, event, puzzle=None, deck=None):
         from naja.scenes.game import GameScene

-        max_health = deck.get('max_health', 4)
-        wins_required = deck.get('wins_required', 4)

         level = 'puzzles/%s' % puzzle
         level = 'puzzles/%s' % puzzle

-        state = GameState.new(deck=level, max_health=max_health,
-                              wins_required=wins_required)
+        state = GameState.new(deck=level)

         LoadGameEvent.post(state=state)
         SceneChangeEvent.post(GameScene)
 
         LoadGameEvent.post(state=state)
         SceneChangeEvent.post(GameScene)