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

edit: Fix reporting of no-op unit location change

Browse source 
Report "unchanged" instead of "changed from X,Y to X,Y".  Screwed up
in v4.3.32.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-14 23:26:06 +01:00
parent caf239b3ed
commit 964f55794c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
* Chad Zabel, 1994 * Chad Zabel, 1994
* Steve McClure, 1998-2000 * Steve McClure, 1998-2000
* Ron Koenderink, 2003-2009 * Ron Koenderink, 2003-2009
* Markus Armbruster, 2003-2013 * Markus Armbruster, 2003-2014
*/ */
#include <config.h> #include <config.h>
@ -798,7 +798,7 @@ edit_unit(struct empobj *unit, char *key, char *p,
return RET_FAIL; return RET_FAIL;
} }
divine_unit_change_quiet(unit, "Location", divine_unit_change_quiet(unit, "Location",
unit->own && unit->own != player->cnum, newx != unit->x || newy != unit->y,
"from %s to %s", "from %s to %s",
xyas(unit->x, unit->y, player->cnum), xyas(unit->x, unit->y, player->cnum),
xyas(newx, newy, player->cnum)); xyas(newx, newy, player->cnum));

8
tests/actofgod/journal.log
View file

@ -886,7 +886,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit s 3 L 1,-1 Play#0 input edit s 3 L 1,-1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Location of cs cargo ship (#3) changed from 1,-1 to 1,-1 Play#0 output Play#0 1 Location of cs cargo ship (#3) unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 0 @ 0 Play#0 input edit p 0 @ 0
Play#0 command edit Play#0 command edit
@ -936,7 +936,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 3 l 1,-1 Play#0 input edit p 3 l 1,-1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Location of f1 Sopwith Camel #3 changed from 1,-1 to 1,-1 Play#0 output Play#0 1 Location of f1 Sopwith Camel #3 unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit u 0 @ 0 Play#0 input edit u 0 @ 0
Play#0 command edit Play#0 command edit
@ -986,7 +986,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit u 3 L 1,-1 Play#0 input edit u 3 L 1,-1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Location of sup supply #3 changed from 1,-1 to 1,-1 Play#0 output Play#0 1 Location of sup supply #3 unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit n 0 @ 0 Play#0 input edit n 0 @ 0
Play#0 command edit Play#0 command edit
@ -1036,7 +1036,7 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit n 3 L 1,-1 Play#0 input edit n 3 L 1,-1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Location of 10kt fission warhead #3 changed from 1,-1 to 1,-1 Play#0 output Play#0 1 Location of 10kt fission warhead #3 unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit s 6 t lc O 1 t lc t hc g 8 t lc Play#0 input edit s 6 t lc O 1 t lc t hc g 8 t lc
Play#0 command edit Play#0 command edit