Restore timeout test.

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

diff --git a/sst.py b/sst.py
index 5200f24619fce2d5e8b677a872934df1baf050cb..94bc397b2c0f8e5df713a84398b8098e03c80dc6 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -1330,12 +1330,13 @@ def torpedo(origin, bearing, dispersion, number, nburst):
                     displacement = course(track.bearing+rnd.real(-2.4, 2.4), distance=2**0.5, origin=w)
                     displacement.nexttok()
                     bumpto = displacement.sector()
-                    if not bumpto.valid_sector():
-                        prout(_(" damaged but not destroyed."))
-                        return None
                     if game.quad[bumpto.i][bumpto.j] == ' ':
                         prout(_(" buffeted into black hole."))
                         deadkl(w, iquad, bumpto)
+                        return None
+                    if not bumpto.valid_sector():
+                        prout(_(" damaged but not destroyed."))
+                        return None
                     if game.quad[bumpto.i][bumpto.j] != '.':
                         prout(_(" damaged but not destroyed."))
                     else:
@@ -6772,7 +6773,7 @@ if __name__ == '__main__':
             logfp.write("# options %s\n" % " ".join(arguments))
             logfp.write("# SST2K version %s\n" % version)
             logfp.write("# recorded by %s@%s on %s\n" % \
-                    (getpass.getuser(),socket.gethostname(),time.ctime()))
+                    (getpass.getuser(),socket.getfqdn(),time.ctime()))
         rnd.seed(seed)
         scanner = sstscanner()
         for arg in arguments: