Mercurial > mamba

changeset 355:7d5bf8e72c61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore --level.
author Simon Cross <hodgestar@gmail.com>
date Fri, 16 Sep 2011 23:40:21 +0200
parents 46565a047ac0
children 5f6a23b62b85
files mamba/__main__.py mamba/gamestate.py
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mamba/__main__.py	Fri Sep 16 23:38:53 2011 +0200
+++ b/mamba/__main__.py	Fri Sep 16 23:40:21 2011 +0200
@@ -10,6 +10,7 @@
 from mamba.gamestate import load_state, load_levels
 from mamba.sound import SoundSystem
 from mamba.habitats.mainmenu import MainMenu
+from mamba.habitats.levelmenu import LevelMenu
 from mamba.habitats.level import LevelHabitat
 from mamba.habitats.editor import EditorHabitat
 from mamba.level import Level
@@ -33,7 +34,7 @@
     if options.edit:
         start = EditorHabitat(Level(options.level))
     elif options.level is not None:
-        start = LevelHabitat(Level(options.level))
+        start = LevelHabitat(Level(options.level), LevelMenu.go_menu)
     else:
         start = MainMenu()
 
--- a/mamba/gamestate.py	Fri Sep 16 23:38:53 2011 +0200
+++ b/mamba/gamestate.py	Fri Sep 16 23:40:21 2011 +0200
@@ -20,15 +20,13 @@
 
 
 def load_state():
-    global done_levels
+    done_levels.clear()
     fn = os.path.join(options.save_location, 'gamestate.json')
     if os.access(fn, os.R_OK):
         f = open(fn, 'r')
         state = json.load(f)
         f.close()
-        done_levels = set(state['done_levels'])
-    else:
-        done_levels = set((0,))
+        done_levels.update(state['done_levels'])
 
 
 def save_state():
@@ -43,9 +41,8 @@
 
 
 def load_levels():
-    global levels
     f = open(filepath('levels/index.txt'))
-    levels = []
+    del levels[:]
     for line in f.readlines():
         line = line.strip()
         if line and line[0] != '#':