projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix password acceptance
[super-star-trek.git]
/
sst.py
diff --git
a/sst.py
b/sst.py
index 966795cf654b93d490dc529fe57ab63760065feb..89715b4ee01afa239baeac14d639bb24782deda0 100755
(executable)
--- a/
sst.py
+++ b/
sst.py
@@
-915,7
+915,7
@@
def doshield(shraise):
action = "SHUP"
else:
scanner.chew()
action = "SHUP"
else:
scanner.chew()
- return
+ return
if action == "SHUP": # raise shields
if game.shldup:
prout(_("Shields already up."))
if action == "SHUP": # raise shields
if game.shldup:
prout(_("Shields already up."))
@@
-2664,7
+2664,6
@@
def selfdestruct():
prout(_("SELF-DESTRUCT-SEQUENCE-WILL-BE-ABORTED"))
skip(1)
scanner.next()
prout(_("SELF-DESTRUCT-SEQUENCE-WILL-BE-ABORTED"))
skip(1)
scanner.next()
- scanner.chew()
if game.passwd != scanner.token:
prouts(_("PASSWORD-REJECTED;"))
skip(1)
if game.passwd != scanner.token:
prouts(_("PASSWORD-REJECTED;"))
skip(1)
@@
-2692,11
+2691,9
@@
def kaboom():
skip(1)
if len(game.enemies) != 0:
whammo = 25.0 * game.energy
skip(1)
if len(game.enemies) != 0:
whammo = 25.0 * game.energy
- l=1
- while l <= len(game.enemies):
+ for l in range(len(game.enemies)):
if game.enemies[l].power*game.enemies[l].kdist <= whammo:
deadkl(game.enemies[l].location, game.quad[game.enemies[l].location.i][game.enemies[l].location.j], game.enemies[l].location)
if game.enemies[l].power*game.enemies[l].kdist <= whammo:
deadkl(game.enemies[l].location, game.quad[game.enemies[l].location.i][game.enemies[l].location.j], game.enemies[l].location)
- l += 1
finish(FDILITHIUM)
def killrate():
finish(FDILITHIUM)
def killrate():
@@
-3161,16
+3158,11
@@
def skip(i):
"Skip i lines. Pause game if this would cause a scrolling event."
for dummy in range(i):
if game.options & OPTION_CURSES:
"Skip i lines. Pause game if this would cause a scrolling event."
for dummy in range(i):
if game.options & OPTION_CURSES:
- (y, x) = curwnd.getyx()
- (my, mx) = curwnd.getmaxyx()
- if curwnd == message_window and y >= my - 2:
- pause_game()
- clrscr()
- else:
- try:
- curwnd.move(y+1, 0)
- except curses.error:
- pass
+ (y, x) = curwnd.getyx()
+ try:
+ curwnd.move(y+1, 0)
+ except curses.error:
+ pass
else:
global linecount
linecount += 1
else:
global linecount
linecount += 1
@@
-3182,6
+3174,11
@@
def skip(i):
def proutn(line):
"Utter a line with no following line feed."
if game.options & OPTION_CURSES:
def proutn(line):
"Utter a line with no following line feed."
if game.options & OPTION_CURSES:
+ (y, x) = curwnd.getyx()
+ (my, mx) = curwnd.getmaxyx()
+ if curwnd == message_window and y >= my - 2:
+ pause_game()
+ clrscr()
curwnd.addstr(line)
curwnd.refresh()
else:
curwnd.addstr(line)
curwnd.refresh()
else: