empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

retreat lretreat edit xdump: Change "torped" to "torpedoed"

Browse source 
"torped" comes from symbol table retreat_flags.  Visible in output of
edit, retreat, lretreat and xdump.  Tolerable in edit, but player
commands like retreat should really use proper words.

Fixing it in retreat_flags changes xdump output, thus risks breaking
clients.  Do it anyway, since no known client recognizes this
particular symbol value.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-10 08:52:59 +01:00
parent e92a522731
commit d5d92caf94
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/global/symbol.c
View file

@ -27,7 +27,7 @@
* symbol.c: Empire symbol tables * symbol.c: Empire symbol tables
* *
* Known contributors to this file: * Known contributors to this file:
* Markus Armbruster, 2006-2014 * Markus Armbruster, 2006-2015
*/ */
#include <config.h> #include <config.h>
@ -236,7 +236,7 @@ struct symbol resources[] = {
struct symbol retreat_flags[] = { struct symbol retreat_flags[] = {
{RET_GROUP, "group"}, {RET_GROUP, "group"},
{RET_INJURED, "injured"}, {RET_INJURED, "injured"},
{RET_TORPED, "torped"}, {RET_TORPED, "torpedoed"},
{RET_SONARED, "sonared"}, {RET_SONARED, "sonared"},
{RET_HELPLESS, "helpless"}, {RET_HELPLESS, "helpless"},
{RET_BOMBED, "bombed"}, {RET_BOMBED, "bombed"},

16
tests/actofgod/journal.log
View file

@ -1402,8 +1402,8 @@
Play#0 input edit s 3 W 513 W 1030 W 2 Play#0 input edit s 3 W 513 W 1030 W 2
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: group, #9 set Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: group, #9 set
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: injured, torped, #10 set, and group, #9 cleared Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: injured, torpedoed, #10 set, and group, #9 cleared
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: torped, #10 cleared Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed: torpedoed, #10 cleared
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit u 2 R "" Play#0 input edit u 2 R ""
Play#0 command edit Play#0 command edit
@ -1421,8 +1421,8 @@
Play#0 input edit u 3 W 513 W 1030 W 2 Play#0 input edit u 3 W 513 W 1030 W 2
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: group, #9 set Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: group, #9 set
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: injured, torped, #10 set, and group, #9 cleared Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: injured, torpedoed, #10 set, and group, #9 cleared
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: torped, #10 cleared Play#0 output Play#0 1 Retreat condition of sup supply #3 changed: torpedoed, #10 cleared
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 2 f 4 Play#0 input edit p 2 f 4
Play#0 command edit Play#0 command edit
@ -2022,12 +2022,12 @@
Play#0 output Play#0 1 Assignment of sup supply #3 changed from army ~ to a by an act of POGO Play#0 output Play#0 1 Assignment of sup supply #3 changed from army ~ to a by an act of POGO
Play#0 output Play#0 1 Retreat path of cs cargo ship (#3) changed from to jj by an act of POGO Play#0 output Play#0 1 Retreat path of cs cargo ship (#3) changed from to jj by an act of POGO
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: group set Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: group set
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: injured, torped set and group cleared Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: injured, torpedoed set and group cleared
Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: torped cleared Play#0 output Play#0 1 Retreat conditions of cs cargo ship (#3) changed by an act of POGO: torpedoed cleared
Play#0 output Play#0 1 Retreat path of sup supply #3 changed from to jj by an act of POGO Play#0 output Play#0 1 Retreat path of sup supply #3 changed from to jj by an act of POGO
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: group set Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: group set
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: injured, torped set and group cleared Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: injured, torpedoed set and group cleared
Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: torped cleared Play#0 output Play#0 1 Retreat condition of sup supply #3 changed by an act of POGO: torpedoed cleared
Play#0 output Play#0 1 f1 Sopwith Camel #3 loaded onto ship #3 by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #3 loaded onto ship #3 by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #4 loaded onto ship #4 by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #4 loaded onto ship #4 by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #4 unloaded from ship #4 by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #4 unloaded from ship #4 by an act of POGO!

6
tests/retreat/final.xdump
View file

@ -27,7 +27,7 @@ config ship
uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access name xbuilt ybuilt builder rflags rpath uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access name xbuilt ybuilt builder rflags rpath
0 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 0 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
1 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 1 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
2 1 -3 1 10 93 118 0 45 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped sonared helpless bombed depth-charged boarded) "bgyujnbgy" 2 1 -3 1 10 93 118 0 45 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torpedoed sonared helpless bombed depth-charged boarded) "bgyujnbgy"
3 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 3 1 -3 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
4 1 -5 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b" 4 1 -5 1 10 100 127 0 45 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (group helpless) "b"
5 1 -5 1 17 96 63 0 70 0 0 none 0 "" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 5 1 -5 1 17 96 63 0 70 0 0 none 0 "" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
@ -77,10 +77,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
83 2 -4 4 17 29 -28 0 70 -6 2 none 1 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 83 2 -4 4 17 29 -28 0 70 -6 2 none 1 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
84 2 -6 2 17 100 127 0 70 -6 2 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn" 84 2 -6 2 17 100 127 0 70 -6 2 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured helpless bombed) "nn"
100 2 2 -6 10 50 16 0 45 0 4 none 1 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 100 2 2 -6 10 50 16 0 45 0 4 none 1 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
101 2 0 4 10 100 127 0 45 0 4 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "nn" 101 2 0 4 10 100 127 0 45 0 4 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torpedoed helpless) "nn"
102 2 2 -6 10 71 57 0 45 0 4 none 1 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 102 2 2 -6 10 71 57 0 45 0 4 none 1 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
103 2 2 -6 10 37 -15 0 45 0 4 none 1 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 103 2 2 -6 10 37 -15 0 45 0 4 none 1 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
104 2 0 4 10 100 127 0 45 0 4 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torped helpless) "nn" 104 2 0 4 10 100 127 0 45 0 4 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 (injured torpedoed helpless) "nn"
120 2 -9 1 18 100 93 0 60 -5 1 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 120 2 -9 1 18 100 93 0 60 -5 1 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
130 2 -9 1 12 100 96 0 60 -5 1 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () "" 130 2 -9 1 12 100 96 0 60 -5 1 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -3 1 1 () ""
149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () "" 149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""

2
tests/retreat/journal.log
View file

@ -37,7 +37,7 @@
Play#1 output Play#1 4 Retreat conditions ('?' to list available ones)? Play#1 output Play#1 4 Retreat conditions ('?' to list available ones)?
Play#1 input ? Play#1 input ?
Play#1 output Play#1 1 i retreat when injured Play#1 output Play#1 1 i retreat when injured
Play#1 output Play#1 1 t retreat when torped Play#1 output Play#1 1 t retreat when torpedoed
Play#1 output Play#1 1 s retreat when sonared Play#1 output Play#1 1 s retreat when sonared
Play#1 output Play#1 1 h retreat when helpless Play#1 output Play#1 1 h retreat when helpless
Play#1 output Play#1 1 b retreat when bombed Play#1 output Play#1 1 b retreat when bombed

4
tests/smoke/journal.log
View file

@ -16222,7 +16222,7 @@
Play#0 output Play#0 1 XDUMP retreat-flags 0 Play#0 output Play#0 1 XDUMP retreat-flags 0
Play#0 output Play#0 1 1 "group" Play#0 output Play#0 1 1 "group"
Play#0 output Play#0 1 2 "injured" Play#0 output Play#0 1 2 "injured"
Play#0 output Play#0 1 4 "torped" Play#0 output Play#0 1 4 "torpedoed"
Play#0 output Play#0 1 8 "sonared" Play#0 output Play#0 1 8 "sonared"
Play#0 output Play#0 1 16 "helpless" Play#0 output Play#0 1 16 "helpless"
Play#0 output Play#0 1 32 "bombed" Play#0 output Play#0 1 32 "bombed"
@ -16954,7 +16954,7 @@
Play#1 output Play#1 1 XDUMP retreat-flags 0 Play#1 output Play#1 1 XDUMP retreat-flags 0
Play#1 output Play#1 1 1 "group" Play#1 output Play#1 1 1 "group"
Play#1 output Play#1 1 2 "injured" Play#1 output Play#1 1 2 "injured"
Play#1 output Play#1 1 4 "torped" Play#1 output Play#1 1 4 "torpedoed"
Play#1 output Play#1 1 8 "sonared" Play#1 output Play#1 1 8 "sonared"
Play#1 output Play#1 1 16 "helpless" Play#1 output Play#1 1 16 "helpless"
Play#1 output Play#1 1 32 "bombed" Play#1 output Play#1 1 32 "bombed"