projects
/
erdslangetjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix corner case crash
[erdslangetjie.git]
/
erdslangetjie
/
level.py
diff --git
a/erdslangetjie/level.py
b/erdslangetjie/level.py
index 4f8059e5383d65add9a62b436c0426874ecdcabe..e4bc0e09a58072ea9c28dccdd2e4f8a790d9a6fb 100644
(file)
--- a/
erdslangetjie/level.py
+++ b/
erdslangetjie/level.py
@@
-73,9
+73,9
@@
class Level(object):
exit_points = 0
for line in self._data:
if ENTRY in line:
exit_points = 0
for line in self._data:
if ENTRY in line:
- entry_points +=
1
+ entry_points +=
line.count(ENTRY)
if EXIT in line:
if EXIT in line:
- exit_points +=
1
+ exit_points +=
line.count(EXIT)
if entry_points == 0:
raise RuntimeError('No entry point')
if entry_points > 1:
if entry_points == 0:
raise RuntimeError('No entry point')
if entry_points > 1:
@@
-179,7
+179,6
@@
class Level(object):
self._data[pos[1]][pos[0]]
except IndexError:
return False
self._data[pos[1]][pos[0]]
except IndexError:
return False
- print pos, self._data[pos[1]][pos[0]]
return True
def blocked(self, pos):
return True
def blocked(self, pos):
@@
-242,10
+241,16
@@
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:
else:
- print 'Level list includes non-existant level %s' % line
+ raise RuntimeError('Level list includes non-existant level %s' % line)
level_list.close()
self._cur_level = 0
level_list.close()
self._cur_level = 0