retreat: Reject invalid retreat paths

[empserver] / tests / retreat / journal.log

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index 93a46154426335257d46ddbb6026a72da62a9fb4..ab6364031c555553cea0ab7b06f01f4f92f7f9b7 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -22,9 +22,15 @@
     Play#1 output Play#1 6 0 640
     Play#1 input retr 0 garbage i
     Play#1 command retreat
-    Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
-    Play#1 output Play#1 1    0 cs   cargo ship    -3,1    a garbage             i
-    Play#1 output Play#1 1 1 ship
+    Play#1 output Play#1 1 'a' is not a valid direction...
+    Play#1 output Play#1 1 Legal directions are:
+    Play#1 output Play#1 1  y u
+    Play#1 output Play#1 1 g   j
+    Play#1 output Play#1 1  b n
+    Play#1 output Play#1 1 Usage: retreat <SHIPS|FLEET> <PATH> [i|t|s|h|b|d|u|c]
+    Play#1 output Play#1 6 0 640
+    Play#1 input __cmd added 0 -1 0
+    Play#1 command __cmd
     Play#1 output Play#1 6 0 639
     Play#1 input retr 1 g
     Play#1 command retreat
@@ -50,7 +56,7 @@
     Play#1 output Play#1 1    3 cs   cargo ship    -3,1    a bgyujnbgy           itshbdu
     Play#1 output Play#1 1 2 ships
     Play#1 output Play#1 6 0 638
-    Play#1 input retr 3 ignored c
+    Play#1 input retr 3 h c
     Play#1 command retreat
     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
     Play#1 output Play#1 1    3 cs   cargo ship    -3,1    a
@@ -67,7 +73,7 @@
     Play#1 output Play#1 4 ship(s)?
     Play#1 input 0/1/2/3/4
     Play#1 output Play#1 1 shp#     ship type       x,y   fl path       as flt?  flags
-    Play#1 output Play#1 1    0 cs   cargo ship    -3,1    a garbage             i
+    Play#1 output Play#1 1    0 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    1 cs   cargo ship    -3,1    a
     Play#1 output Play#1 1    2 cs   cargo ship    -3,1      bgyujnbgy           itshbdu
     Play#1 output Play#1 1    3 cs   cargo ship    -3,1    a
@@ -76,9 +82,15 @@
     Play#1 output Play#1 6 0 635
     Play#1 input lret 0 garbage i
     Play#1 command lretreat
-    Play#1 output Play#1 1 lnd#     unit type       x,y   ar path       as army? flags
-    Play#1 output Play#1 1    0 inf  infantry      -3,1    a garbage             i
-    Play#1 output Play#1 1 1 unit
+    Play#1 output Play#1 1 'a' is not a valid direction...
+    Play#1 output Play#1 1 Legal directions are:
+    Play#1 output Play#1 1  y u
+    Play#1 output Play#1 1 g   j
+    Play#1 output Play#1 1  b n
+    Play#1 output Play#1 1 Usage: lretreat <UNITS|ARMY> <PATH> [i|h|b|c]
+    Play#1 output Play#1 6 0 635
+    Play#1 input __cmd added 0 -1 0
+    Play#1 command __cmd
     Play#1 output Play#1 6 0 634
     Play#1 input lret 1 g
     Play#1 command lretreat
@@ -100,7 +112,7 @@
     Play#1 output Play#1 1    3 inf  infantry      -3,1    a yujnbgyuj           ihb
     Play#1 output Play#1 1 2 units
     Play#1 output Play#1 6 0 633
-    Play#1 input lret 3 ignored c
+    Play#1 input lret 3 h c
     Play#1 command lretreat
     Play#1 output Play#1 1 lnd#     unit type       x,y   ar path       as army? flags
     Play#1 output Play#1 1    3 inf  infantry      -3,1    a
@@ -117,7 +129,7 @@
     Play#1 output Play#1 4 land(s)?
     Play#1 input 0/1/2/3/4
     Play#1 output Play#1 1 lnd#     unit type       x,y   ar path       as army? flags
-    Play#1 output Play#1 1    0 inf  infantry      -3,1    a garbage             i
+    Play#1 output Play#1 1    0 inf  infantry      -3,1    a
     Play#1 output Play#1 1    1 inf  infantry      -3,1    a
     Play#1 output Play#1 1    2 inf  infantry      -3,1      yujnbgyuj           ihb
     Play#1 output Play#1 1    3 inf  infantry      -3,1    a