Forward-porting to Python 2.6 exposed a bug.

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

diff --git a/src/sst.py b/src/sst.py
index f6ea2b3cc74def8b17eaad490e7303650f879257..143ca5363622f8776ee8b92f73e811b887216903 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -649,7 +649,7 @@ def movescom(iq, avoid):
     game.state.kscmdr = iq
     game.state.galaxy[game.state.kscmdr.i][game.state.kscmdr.j].klingons += 1
     if game.state.kscmdr==game.quadrant:
-       # SC has scooted, Remove him from current quadrant 
+       # SC has scooted, remove him from current quadrant 
        game.iscate=False
        game.isatb=0
        game.ientesc = False
@@ -2326,7 +2326,7 @@ def events():
                else:
                    prout(_("Uhura- Starfleet reports increased Klingon activity"))
                    if q.planet != None:
-                       proutn(_("near %s") % q.planet)
+                       proutn(_("near %s ") % q.planet)
                    prout(_("in Quadrant %s.") % w)
                                
 def wait():
@@ -4458,7 +4458,7 @@ def usecrystals():
     skip(1)
     prouts(_("Scotty-  \"Keep your fingers crossed, Sir!\""))
     skip(1)
-    if with(game.cryprob):
+    if random.random() > game.cryprob:
        prouts(_("  \"Activating now! - - No good!  It's***"))
        skip(2)
        prouts(_("***RED ALERT!  RED A*L********************************"))
@@ -6197,8 +6197,12 @@ if __name__ == '__main__':
                 sys.stderr.write("usage: sst [-t] [-x] [startcommand...].\n")
                 raise SystemExit, 1
         # where to save the input in case of bugs
+        if "TMPDIR" in os.environ:
+            tmpdir = os.environ['TMPDIR']
+        else:
+            tmpdir = "/tmp"
         try:
-            logfp = open("/tmp/sst-input.log", "w")
+            logfp = open(os.path.join(tmpdir, "sst-input.log"), "w")
         except IOError:
             sys.stderr.write("sst: warning, can't open logfile\n")
             sys.exit(1)