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

swapsector: Notify affected sector owners

Browse source 
Send bulletins, like edit does.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-26 23:18:01 +01:00
parent e109d981b8
commit eb60b38a26
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/commands/swap.c
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Ken Stevens, 1995 * Ken Stevens, 1995
* Markus Armbruster, 2006-2010 * Markus Armbruster, 2006-2013
*/ */
#include <config.h> #include <config.h>
@ -46,6 +46,8 @@ swaps(void)
struct sctstr secta, sectb, tmp; struct sctstr secta, sectb, tmp;
char buf[1024]; char buf[1024];
char *p; char *p;
int i;
natid to;
if (!(p = getstarg(player->argp[1], "First sector : ", buf)) || if (!(p = getstarg(player->argp[1], "First sector : ", buf)) ||
!sarg_xy(p, &secta.sct_x, &secta.sct_y) || !sarg_xy(p, &secta.sct_x, &secta.sct_y) ||
@ -61,6 +63,15 @@ swaps(void)
return RET_FAIL; return RET_FAIL;
if (!check_sect_ok(&secta) || !check_sect_ok(&sectb)) if (!check_sect_ok(&secta) || !check_sect_ok(&sectb))
return RET_FAIL; return RET_FAIL;
for (i = 0; i <= (secta.sct_own != sectb.sct_own); i++) {
to = i == 0 ? secta.sct_own : sectb.sct_own;
if (to && to != player->cnum)
wu(0, to,
"Sector %s swapped with %s by an act of %s!\n",
xyas(secta.sct_x, secta.sct_y, to),
xyas(sectb.sct_x, sectb.sct_y, to),
cname(player->cnum));
}
tmp = secta; tmp = secta;
/* change the location of secta to that of sectb */ /* change the location of secta to that of sectb */
secta.sct_x = sectb.sct_x; secta.sct_x = sectb.sct_x;

2
tests/actofgod/journal.log
View file

@ -1617,6 +1617,7 @@
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Sector 5,7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 5,7 given to you by an act of POGO!
Play#0 output Play#0 1 Sector 11,7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 11,7 given to you by an act of POGO!
Play#0 output Play#0 1 Sector -2,2 swapped with 2,-2 by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#2) given to you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#2) given to you by an act of POGO!
Play#0 output Play#0 1 f1 Sopwith Camel #2 given to you by an act of POGO! Play#0 output Play#0 1 f1 Sopwith Camel #2 given to you by an act of POGO!
Play#0 output Play#0 1 sup supply #2 given to you by an act of POGO! Play#0 output Play#0 1 sup supply #2 given to you by an act of POGO!
@ -1630,6 +1631,7 @@
Play#0 output Play#0 1 Sector 3,-7 given to you by an act of POGO! Play#0 output Play#0 1 Sector 3,-7 given to you by an act of POGO!
Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1) by an act of POGO Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1) by an act of POGO
Play#0 output Play#0 1 Old owner of 3,-3 changed from 3 (#3) to 1 (#1) by an act of POGO Play#0 output Play#0 1 Old owner of 3,-3 changed from 3 (#3) to 1 (#1) by an act of POGO
Play#0 output Play#0 1 Sector -2,2 swapped with 2,-2 by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#0) taken from you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#0) taken from you by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#1) taken from you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#1) taken from you by an act of POGO!
Play#0 output Play#0 1 cs cargo ship (#2) taken from you by an act of POGO! Play#0 output Play#0 1 cs cargo ship (#2) taken from you by an act of POGO!