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

unload lunload: Say "Can't unload" instead of "Can't load"

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-09-16 09:59:55 +02:00
parent 3aa6c1b263
commit 581732dcd1
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/load.c
View file

@ -87,7 +87,7 @@ load(void)
else if (NULL != (ich = item_by_name(p))) else if (NULL != (ich = item_by_name(p)))
type = EF_SECTOR; type = EF_SECTOR;
else { else {
pr("Can't load '%s'\n", p); pr("Can't %sload '%s'\n", loading ? "" : "un", p);
return RET_SYN; return RET_SYN;
} }
@ -216,7 +216,7 @@ lload(void)
else if (NULL != (ich = item_by_name(p))) else if (NULL != (ich = item_by_name(p)))
type = EF_SECTOR; type = EF_SECTOR;
else { else {
pr("Can't load '%s'\n", p); pr("Can't %sload '%s'\n", loading ? "" : "un", p);
return RET_SYN; return RET_SYN;
} }

1
tests/load-tend/01-load-1
View file

@ -82,7 +82,6 @@ load x
lload x lload x
unload x unload x
lunload x lunload x
| odd: "Can't load" even for unload
| invalid ship | invalid ship
load f -1 load f -1
unload f -1 unload f -1

4
tests/load-tend/journal.log
View file

@ -32,12 +32,12 @@
Play#1 output Play#1 6 0 640 Play#1 output Play#1 6 0 640
Play#1 input unload x Play#1 input unload x
Play#1 command unload Play#1 command unload
Play#1 output Play#1 1 Can't load 'x' Play#1 output Play#1 1 Can't unload 'x'
Play#1 output Play#1 1 Usage: unload <COMM|"land"|"plane"> <SHIPS> <NUM|UNIT|PLANE> Play#1 output Play#1 1 Usage: unload <COMM|"land"|"plane"> <SHIPS> <NUM|UNIT|PLANE>
Play#1 output Play#1 6 0 640 Play#1 output Play#1 6 0 640
Play#1 input lunload x Play#1 input lunload x
Play#1 command lunload Play#1 command lunload
Play#1 output Play#1 1 Can't load 'x' Play#1 output Play#1 1 Can't unload 'x'
Play#1 output Play#1 1 Usage: lunload <COMM|"land"|"plane"> <UNITS> <NUM|UNITS|PLANES> Play#1 output Play#1 1 Usage: lunload <COMM|"land"|"plane"> <UNITS> <NUM|UNITS|PLANES>
Play#1 output Play#1 6 0 640 Play#1 output Play#1 6 0 640
Play#1 input load f -1 Play#1 input load f -1