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

edit: Suppress bulletin on no-op unit location change

Browse source 
Screwed up in commit a03d804f, v4.3.32.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-12-29 20:30:14 +01:00
parent 5dd2cbd423
commit b68b3c4589
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -781,6 +781,8 @@ edit_unit(struct empobj *unit, char *key, char *p,
"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));
if (newx == unit->x && newy == unit->y)
break;
if (unit->own && unit->own != player->cnum) if (unit->own && unit->own != player->cnum)
wu(0, unit->own, wu(0, unit->own,
"Location of %s changed from %s to %s by an act of %s!\n", "Location of %s changed from %s to %s by an act of %s!\n",

3
tests/actofgod/journal.log
View file

@ -1844,7 +1844,6 @@
Play#0 output Play#0 1 cs cargo ship (#5) given to you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#5) given to you by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#3) taken from you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#3) taken from you by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#3) given to you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#3) given to you by an act of POGO!
Play#0 output Play#0 1 Location of cs cargo ship (#3) changed from 1,-1 to 1,-1 by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #0 taken from you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #0 taken from you by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #1 taken from you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #1 taken from you by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #2 taken from you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #2 taken from you by an act of POGO!
@ -1853,7 +1852,6 @@
Play#0 output Play#0 1 f1 Sopwith Camel #5 given to you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #5 given to you by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #3 taken from you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #3 taken from you by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #3 given to you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #3 given to you by an act of POGO!
Play#0 output Play#0 1 Location of f1 Sopwith Camel #3 changed from 1,-1 to 1,-1 by an act of POGO!
Play#0 output Play#0 1 sup supply #0 taken from you by an act of POGO! Play#0 output Play#0 1 sup supply #0 taken from you by an act of POGO!
Play#0 output Play#0 1 sup supply #1 taken from you by an act of POGO! Play#0 output Play#0 1 sup supply #1 taken from you by an act of POGO!
Play#0 output Play#0 1 sup supply #2 taken from you by an act of POGO! Play#0 output Play#0 1 sup supply #2 taken from you by an act of POGO!
@ -1862,7 +1860,6 @@
Play#0 output Play#0 1 sup supply #5 given to you by an act of POGO! Play#0 output Play#0 1 sup supply #5 given to you by an act of POGO!
Play#0 output Play#0 1 sup supply #3 taken from you by an act of POGO! Play#0 output Play#0 1 sup supply #3 taken from you by an act of POGO!
Play#0 output Play#0 1 sup supply #3 given to you by an act of POGO! Play#0 output Play#0 1 sup supply #3 given to you by an act of POGO!
Play#0 output Play#0 1 Location of sup supply #3 changed from 1,-1 to 1,-1 by an act of POGO!
Play#0 output Play#0 1 Efficiency of cs cargo ship (#4) changed from 20 to 100 by an act of POGO Play#0 output Play#0 1 Efficiency of cs cargo ship (#4) changed from 20 to 100 by an act of POGO
Play#0 output Play#0 1 Efficiency of cs cargo ship (#5) changed from 20 to 100 by an act of POGO Play#0 output Play#0 1 Efficiency of cs cargo ship (#5) changed from 20 to 100 by an act of POGO
Play#0 output Play#0 1 Mobility of cs cargo ship (#3) changed from 0 to -127 by an act of POGO Play#0 output Play#0 1 Mobility of cs cargo ship (#3) changed from 0 to -127 by an act of POGO