swapsector: Notify affected sector owners

[empserver] / src / lib / commands / swap.c

diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index c9aad8418b350cd1bba2234fcacc241566df3952..9966cd4e2d71ed375e065021e93c4da5c052478a 100644 (file)
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,10 @@
  *  ---
  *
  *  swap.c: Swap two sectors on the map
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2006-2013
  */
 
 #include <config.h>
@@ -46,6 +46,8 @@ swaps(void)
     struct sctstr secta, sectb, tmp;
     char buf[1024];
     char *p;
+    int i;
+    natid to;
 
     if (!(p = getstarg(player->argp[1], "First sector : ", buf)) ||
        !sarg_xy(p, &secta.sct_x, &secta.sct_y) ||
@@ -57,18 +59,31 @@ swaps(void)
        !getsect(sectb.sct_x, sectb.sct_y, &sectb))
        return RET_SYN;
     print_res(&sectb);
-    if (!confirm ("Are you sure these are the two sectors you wish to swap? "))
+    if (!confirm("Are you sure these are the two sectors you wish to swap? "))
+       return RET_FAIL;
+    if (!check_sect_ok(&secta) || !check_sect_ok(&sectb))
        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;
     /* change the location of secta to that of sectb */
     secta.sct_x = sectb.sct_x;
     secta.sct_y = sectb.sct_y;
+    ef_set_uid(EF_SECTOR, &secta, sectb.sct_uid);
     secta.sct_dist_x = sectb.sct_x;
     secta.sct_dist_y = sectb.sct_y;
     secta.sct_coastal = sectb.sct_coastal;
     /* change the location of sectb to where secta was */
     sectb.sct_x = tmp.sct_x;
     sectb.sct_y = tmp.sct_y;
+    ef_set_uid(EF_SECTOR, &sectb, tmp.sct_uid);
     sectb.sct_dist_x = tmp.sct_x;
     sectb.sct_dist_y = tmp.sct_y;
     sectb.sct_coastal = tmp.sct_coastal;
@@ -90,7 +105,7 @@ print_res(struct sctstr *sp)
 
     pr("%3d ", sp->sct_own);
 
-    prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum);
+    prxy("%4d,%-4d", sp->sct_x, sp->sct_y);
     pr(" %c", dchr[sp->sct_type].d_mnem);
     if (sp->sct_newtype != sp->sct_type)
        pr("%c", dchr[sp->sct_newtype].d_mnem);