Fix listCommands.

[super-star-trek.git] / src / sst.py

diff --git a/src/sst.py b/src/sst.py
index 864dfa1b78586e179b3bd614af62375ad2d3250e..79c8e62d7f1f95381dd788e4412ad3810e4b6d0f 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -3400,7 +3400,10 @@ def skip(i):
                pause_game()
                clrscr()
            else:
-               proutn("\n")
+                try:
+                    curwnd.move(y+1, 0)
+                except curses.error:
+                    pass
        else:
             global linecount
            linecount += 1
@@ -5311,7 +5314,7 @@ def srscan():
        for j in range(QUADSIZE):
            sectscan(goodScan, i, j)
        skip(1)
-                       
+               
 def eta():
     "Use computer to get estimated time of arrival for a warp jump."
     w1 = coord(); w2 = coord()
@@ -6061,12 +6064,14 @@ commands = {
 
 def listCommands():
     "Generate a list of legal commands."
-    proutn(_("LEGAL COMMANDS ARE:"))
-    for (k, key) in enumerate(commands):
+    prout(_("LEGAL COMMANDS ARE:"))
+    emitted = 0
+    for key in commands:
        if not commands[key] or (commands[key] & game.options):
-            if k % 5 == 0:
+            proutn("%-12s " % key)
+            emitted += 1
+            if emitted % 5 == 4:
                 skip(1)
-            proutn("%-12s " % key) 
     skip(1)
 
 def helpme():