Restore m m .1 fix and fix a broken test.

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

diff --git a/sst.py b/sst.py
index b25eeaf41d9d035c618c03000aab9394df33cf8c..ccb1f14c6c2fb37c1e3dfce0de536e6716553475 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -1801,9 +1801,6 @@ def hittem(hits):
     skip(1)
     kk = 0
     for wham in hits:
-        if not kk < len(game.enemies):
-            # Should never happen.
-            break
         if wham == 0:
             continue
         dustfac = randreal(0.9, 1.0)
@@ -4024,8 +4021,12 @@ def getcourse(isprobe):
         key = scanner.nexttok()
         if key == "IHREAL":
             delta.i = scanner.real
-        else:
+        elif key == "IHEOL":
             delta.i = 0
+            scanner.push("\n")
+        else:
+            huh()
+            raise TrekError
     # Check for zero movement
     if delta.i == 0 and delta.j == 0:
         scanner.chew()
@@ -6286,7 +6287,8 @@ def makemoves():
                 huh()
             else:
                 break
-        prout("COMMAND> %s" % cmd)
+        if game.options & OPTION_CURSES:
+            prout("COMMAND> %s" % cmd)
         if cmd == "SRSCAN":                # srscan
             srscan()
         elif cmd == "STATUS":                # status