X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.py;h=db0ef8c69207ac63242132937541405a26a6c0c5;hp=35d1433b7b5b036afac60481ff79ee22f6625519;hb=98e7acdbf3a07df71acbd1b81f636d7e9347711f;hpb=097ac6ffc1531b44d06767be40045795a92321e5

diff --git a/sst.py b/sst.py
index 35d1433..db0ef8c 100755
--- a/sst.py
+++ b/sst.py
@@ -13,7 +13,7 @@ on how to modify (and how not to modify!) this code.
 """
 import os, sys, math, curses, time, readline, cPickle, random, copy, gettext, getpass
 
-version="2.0"
+version="2.1"
 
 docpath  	= (".", "../doc", "/usr/share/doc/sst")
 
@@ -3530,7 +3530,7 @@ def imove(icourse=None, noattack=False):
         if icourse.origin.quadrant() != icourse.location.quadrant():
             newquadrant(noattack)
             break
-        elif check_collision(icourse, w):
+        elif check_collision(w):
             print "Collision detected"
             break
         else:
@@ -3901,7 +3901,7 @@ def warp(wcourse, involuntary):
 		    twarp = False
             wcourse.reset()
     # Activate Warp Engines and pay the cost 
-    imove(course, noattack=False)
+    imove(wcourse, noattack=False)
     if game.alldone:
 	return
     game.energy -= wcourse.power(game.warpfac)
@@ -5203,7 +5203,6 @@ def freeze(boss):
     if key != "IHALPHA":
         huh()
         return
-    scanner.chew()
     if '.' not in scanner.token:
         scanner.token += ".trk"
     try:
@@ -5213,6 +5212,7 @@ def freeze(boss):
 	return
     cPickle.dump(game, fp)
     fp.close()
+    scanner.chew()
 
 def thaw():
     "Retrieve saved game."
@@ -5549,7 +5549,7 @@ def choose():
 	    return True
         if scanner.sees("regular"):
 	    break
-	proutn(_("What is \"%s\"?") % scanner.token)
+	proutn(_("What is \"%s\"? ") % scanner.token)
 	scanner.chew()
     while game.length==0 or game.skill==SKILL_NONE:
 	if scanner.next() == "IHALPHA":
@@ -6369,3 +6369,5 @@ if __name__ == '__main__':
         if logfp:
             logfp.close()
         print ""
+
+# End.