projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent crash when moving Tholian.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index a9aa1a4b53e005fb82d0c95dd3bd8cd8fd7bd0f8..234d37ba9b1d324c4f72040d73241c15db7eda62 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-319,7
+319,9
@@
class Enemy:
else:
self.location = Coord()
self.kdist = self.kavgd = None
else:
self.location = Coord()
self.kdist = self.kavgd = None
- game.enemies.remove(self)
+ # Guard prevents failure on Tholian or thingy
+ if self in game.enemies:
+ game.enemies.remove(self)
return motion
def __repr__(self):
return "<%s,%s.%f>" % (self.type, self.location, self.power) # For debugging
return motion
def __repr__(self):
return "<%s,%s.%f>" % (self.type, self.location, self.power) # For debugging
@@
-6161,6
+6163,7
@@
commands = [
("QUIT", 0),
("HELP", 0),
("SCORE", 0),
("QUIT", 0),
("HELP", 0),
("SCORE", 0),
+ ("CURSES", 0),
("", 0),
]
("", 0),
]
@@
-6381,6
+6384,9
@@
def makemoves():
helpme() # get help
elif cmd == "SCORE":
score() # see current score
helpme() # get help
elif cmd == "SCORE":
score() # see current score
+ elif cmd == "CURSES":
+ game.options |= (OPTION_CURSES | OPTION_COLOR)
+ iostart()
while True:
if game.alldone:
break # Game has ended
while True:
if game.alldone:
break # Game has ended