projects
/
erdslangetjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move game validation to level_list
[erdslangetjie.git]
/
erdslangetjie
/
level.py
diff --git
a/erdslangetjie/level.py
b/erdslangetjie/level.py
index b5dbe1343861f05958fd89d0c494d8e4f46d613c..e4bc0e09a58072ea9c28dccdd2e4f8a790d9a6fb 100644
(file)
--- a/
erdslangetjie/level.py
+++ b/
erdslangetjie/level.py
@@
-241,8
+241,14
@@
class LevelList(object):
line = line.strip()
if os.path.exists(filepath(line)):
level_file = load(line)
line = line.strip()
if os.path.exists(filepath(line)):
level_file = load(line)
-
self.levels.append(Level(level_file)
)
+
level = Level(level_file
)
level_file.close()
level_file.close()
+ try:
+ level.validate()
+ except RuntimeError as err:
+ raise RuntimeError(
+ 'Invalid level %s in level_list: %s' % (line, err))
+ self.levels.append(level)
else:
raise RuntimeError('Level list includes non-existant level %s' % line)
level_list.close()
else:
raise RuntimeError('Level list includes non-existant level %s' % line)
level_list.close()