Avoid potential collision between the new "options" command...

...and argument-setting in replays.

diff --git a/sst b/sst
index a95c9b7372d8da1f1cb7c700c73122567c7bd21f..e0784217561cd5239a2709e5e38131666203519f 100755 (executable)
--- a/sst
+++ b/sst
@@ -6779,7 +6779,6 @@ if __name__ == '__main__':
             game.options |= OPTION_TTY
         seed = int(time.time())
         (options, arguments) = getopt.getopt(sys.argv[1:], "cr:s:txV")
-        replay = False
         for (switch, val) in options:
             if switch == '-r':
                 # pylint: disable=raise-missing-from
@@ -6796,7 +6795,6 @@ if __name__ == '__main__':
                     seed = eval(seed)
                     line = replayfp.readline().strip()
                     arguments += line.split()[2:]
-                    replay = True
                 except ValueError:
                     sys.stderr.write("sst: replay file %s is ill-formed\n"% val)
                     raise SystemExit(1)
@@ -6829,7 +6827,7 @@ if __name__ == '__main__':
             sys.exit(1)
         if logfp:
             logfp.write("# seed %s\n" % seed)
-            logfp.write("# options %s\n" % " ".join(arguments))
+            logfp.write("# arguments %s\n" % " ".join(arguments))
             logfp.write("# SST2K version %s\n" % version)
             logfp.write("# recorded by %s@%s on %s\n" % \
                     (getpass.getuser(),socket.getfqdn(),time.ctime()))
@@ -6849,7 +6847,7 @@ if __name__ == '__main__':
                     game.alldone = False
                 else:
                     makemoves()
-                if replay:
+                if replayfp:
                     break
                 skip(1)
                 stars()

diff --git a/test/test01.log b/test/test01.log
index 5f367026dc8fc2c8524fc66f270fe118f2a7116f..e3bde23d8b8b4ff6599ce793d38fb88f2795053c 100644 (file)
--- a/test/test01.log
+++ b/test/test01.log
@@ -1,5 +1,5 @@
 # seed 1556084761
-# options 
+# arguments 
 # SST2K version 2.4
 # Test bringing game up, viewing galaxy, quitting
 # recorded by esr@snark.thyrsus.com on Wed Apr 24 01:46:01 2019

diff --git a/test/test02.log b/test/test02.log
index e753ea463c4682bf1ed8b2a35881eab9383feb5c..afed55f8cf170f7a1e93fd3ce94c26b7a8fdfd09 100644 (file)
--- a/test/test02.log
+++ b/test/test02.log
@@ -1,5 +1,5 @@
 # seed 1556101787
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.4
 # Test critical hit on sensors
 # recorded by esr@snark.thyrsus.com on Wed Apr 24 06:29:47 2019

diff --git a/test/test03.log b/test/test03.log
index e806862bf0da201bb6cef6778e7e03da14a67a0f..ad6dfb32f6e0e15bcf41b6d36fedfc8fd59cdcb5 100644 (file)
--- a/test/test03.log
+++ b/test/test03.log
@@ -1,5 +1,5 @@
 # seed 1556102474
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.4
 # Test Tholian boxing us in followed by death by tractor beam
 # recorded by esr@snark.thyrsus.com on Wed Apr 24 09:48:31 2019

diff --git a/test/test04.log b/test/test04.log
index 34cfcee02cd2711042c7db2cdbbc7a9352ad43b6..d2c59b4ed9fad765f8b4f87daf64907e0022a854 100644 (file)
--- a/test/test04.log
+++ b/test/test04.log
@@ -1,5 +1,5 @@
 # seed 1556116333
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.4
 # Test starbase destruction, planet destruction, docking after destruction.
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 08:59:1 3 2023

diff --git a/test/test05.log b/test/test05.log
index 82918757f002755ca5b8394fdce9f4c98697c16f..0c96758303be47a62377fac1c25661ecb159472b 100644 (file)
--- a/test/test05.log
+++ b/test/test05.log
@@ -1,5 +1,5 @@
 # seed 1556120044
-# options regular short good fancy
+# arguments regular short good fancy
 # Test deep-space probes
 # recorded by esr@snark.thyrsus.com on Wed Apr 24 11:34:04 2019
 chart

diff --git a/test/test06.log b/test/test06.log
index 3c565bcbbdee4fd5769fc5aea5307a218bc6cee7..141abbfe2d56be1bd317fa35a8645f931dcd9cf5 100644 (file)
--- a/test/test06.log
+++ b/test/test06.log
@@ -1,5 +1,5 @@
 # seed 1556121767
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.4
 # Test shuttle landing with no crystals
 # recorded by esr@snark.thyrsus.com on Wed Apr 24 12:02:47 2019

diff --git a/test/test07.log b/test/test07.log
index 62063db5a6fc88f09ba07c62d53dfda0a59f23be..847c1ce74f783c88b27fec6d536d38d0e20f90d1 100644 (file)
--- a/test/test07.log
+++ b/test/test07.log
@@ -1,5 +1,5 @@
 # seed 1691789031
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test supercommander destruction.
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 17:23:51 2023

diff --git a/test/test08.log b/test/test08.log
index 6c17828e48ea21bd735a199462fb835ade63fc84..db4a397f21245b6524f0ac47c13ed313b377e4fa 100644 (file)
--- a/test/test08.log
+++ b/test/test08.log
@@ -1,5 +1,5 @@
 # seed 1691831923
-# options regular medium novice fancy
+# arguments regular medium novice fancy
 # SST2K version 2.7
 # Test game-win condition
 # recorded by esr@snark.thyrsus.com on Sat Aug 12 05:18:43 2023

diff --git a/test/test09.log b/test/test09.log
index c8217aab01e0463554784324b5dba692af70a532..f3d6c29ee81543dc86dcd2b9963b21c2f473f898 100644 (file)
--- a/test/test09.log
+++ b/test/test09.log
@@ -1,5 +1,5 @@
 # seed 1691779887
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test behavior of Tholian
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 14:51:27 2023

diff --git a/test/test10.log b/test/test10.log
index 447c7e9949d1c43c84b206e8b65f2f2bb96aeb2d..d8acab6d6d5697785835c2975f7eaa6a00e52418 100644 (file)
--- a/test/test10.log
+++ b/test/test10.log
@@ -1,5 +1,5 @@
 # seed 1691834337
-# options regular medium novice fancy
+# arguments regular medium novice fancy
 # SST2K version 2.7
 # Test game timeout condition
 # recorded by esr@snark.thyrsus.com on Sat Aug 12 05:58:57 2023

diff --git a/test/test11.log b/test/test11.log
index a4cf44b1f6bbd7e814b9735cf94929fd0aa201b0..1220f8b812fc5c5d7b00b92e8ec497cca95b5524 100644 (file)
--- a/test/test11.log
+++ b/test/test11.log
@@ -1,5 +1,5 @@
 # seed 1556212919
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.5
 # Test loss by energy exhaustion.
 # recorded by esr@snark.thyrsus.com on Thu Apr 25 13:21:59 2019

diff --git a/test/test12.log b/test/test12.log
index 294f97815bfcc3c9fc6f0247a6dc29ad6667cf74..a4c0a20be0885fdc9e5245be5b54fa3f2c60ccc4 100644 (file)
--- a/test/test12.log
+++ b/test/test12.log
@@ -1,5 +1,5 @@
 # seed 1691778615
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test dilithium mining
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 14:30:15 2023

diff --git a/test/test13.log b/test/test13.log
index e5f3d15d0c9f2dd5a722ce8020839fe4cc7289a1..10e1abeb51b338e9745210ec69af313f8a271db2 100644 (file)
--- a/test/test13.log
+++ b/test/test13.log
@@ -1,5 +1,5 @@
 # seed 1556292107
-# options regular short good fancy
+# arguments regular short good fancy
 # SST2K version 2.5
 # Test multiple critical hits ending in defeat by Supercommander
 # recorded by esr@snark.thyrsus.com on Fri Apr 26 11:21:47 2019

diff --git a/test/test14.log b/test/test14.log
index fc6263ce982c082acfd1acabb97721c72168ecc5..b8bce3c268caee78ccbfb1a897b6dedb77a9390b 100644 (file)
--- a/test/test14.log
+++ b/test/test14.log
@@ -1,5 +1,5 @@
 # seed 1691765367
-# options 
+# arguments 
 # SST2K version 2.7
 # Test death by black hole
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 10:49:27 2023

diff --git a/test/test15.log b/test/test15.log
index 63964966ed0a5d81cb7ff25e229adeaeb5ea92d3..23957f40caf34b7170e1b9267f32a0667f9dade2 100644 (file)
--- a/test/test15.log
+++ b/test/test15.log
@@ -1,5 +1,5 @@
 # seed 1691766356
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test encounter with Romulan and multiline torpedo firing
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 11:05:56 2023

diff --git a/test/test16.log b/test/test16.log
index fc379d36b3a75f27c858c61de43e2ff0e7c32350..4b6e8685dc52dffb51e85d631e0dd982cabf2a9b 100644 (file)
--- a/test/test16.log
+++ b/test/test16.log
@@ -1,5 +1,5 @@
 # seed 1691769251
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test malformed torpedo command
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 11:54:11 2023

diff --git a/test/test17.log b/test/test17.log
index ae86e9ba3b34bd5b761e288c8df3e0419afe0a99..d753f504e5798e506830011a29e0bc5490aeb26a 100644 (file)
--- a/test/test17.log
+++ b/test/test17.log
@@ -1,5 +1,5 @@
 # seed 1691774489
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test commander destruction and supernova alert
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 13:31:26 2023

diff --git a/test/test18.log b/test/test18.log
index f5d08dd3aa98040f10a4d9e18eae8b74cb39730b..c9c34788a486ba3a4dc389d9183f3331b585e6b9 100644 (file)
--- a/test/test18.log
+++ b/test/test18.log
@@ -1,5 +1,5 @@
 # seed 1691786582
-# options regular medium good fancy
+# arguments regular medium good fancy
 # SST2K version 2.7
 # Test behavior when emy is buffered into black hole
 # recorded by esr@snark.thyrsus.com on Fri Aug 11 16:43:02 2023