From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 17 Feb 2012 12:13:29 +0000 (-0500)
Subject: Fix strange bug in warp code.
X-Git-Tag: 2.2~114
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=b6cc14edc2199abd08cbb16a12359f3084582023;hp=b039f9f202f3a7774e5daa92f8cd0ed9940045a8

Fix strange bug in warp code.
---

diff --git a/sst.py b/sst.py
index bf13aa9..e140f25 100755
--- a/sst.py
+++ b/sst.py
@@ -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)
@@ -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":