/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, 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,
* 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/>.
*
* ---
*
* ---
*
* swap.c: Swap two sectors on the map
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995
+ * Markus Armbruster, 2006-2010
*/
#include <config.h>
!getsect(sectb.sct_x, sectb.sct_y, §b))
return RET_SYN;
print_res(§b);
- 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(§a) || !check_sect_ok(§b))
return RET_FAIL;
tmp = secta;
/* change the location of secta to that of sectb */
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);