projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Curses is not currently a problem.
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index 3b00bd6dc994c64f2e2a94443f6e1c448ab4ace8..0bb0a5b430f77751d2d1aed41507fa3aa47ef9a3 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
@@
-2606,7
+2608,7
@@
def wait():
if key != "IHEOL":
break
proutn(_("How long? "))
if key != "IHEOL":
break
proutn(_("How long? "))
- scanner.chew()
+
scanner.chew()
if key != "IHREAL":
huh()
return
if key != "IHREAL":
huh()
return
@@
-3431,8
+3433,8
@@
def proutn(proutntline):
pause_game()
clrscr()
# Uncomment this to debug curses problems
pause_game()
clrscr()
# Uncomment this to debug curses problems
- if logfp:
- logfp.write("#curses: at %s proutn(%s)\n" % ((y, x), repr(proutntline)))
+
#
if logfp:
+
#
logfp.write("#curses: at %s proutn(%s)\n" % ((y, x), repr(proutntline)))
curwnd.addstr(proutntline)
curwnd.refresh()
else:
curwnd.addstr(proutntline)
curwnd.refresh()
else: