/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2017, 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* flee.c: Add ships to a fleet
- *
+ *
* Known contributors to this file:
- *
+ *
*/
+#include <config.h>
+
#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
#include "commands.h"
+#include "ship.h"
int
flee(void)
{
struct shpstr ship;
- register int count;
- s_char *cp;
- s_char c;
+ int count;
+ char *cp;
+ char c;
struct nstr_item nstr;
struct nstr_item ni;
struct shpstr ship2;
- int r;
- s_char buf[1024];
+ char buf[1024];
cp = getstarg(player->argp[1], "fleet? ", buf);
- if (cp == 0)
+ if (!cp)
return RET_SYN;
c = *cp;
if (!isalpha(c) && c != '~') {
return RET_SYN;
}
if (c == '~')
- c = ' ';
- if (!snxtitem(&nstr, EF_SHIP, player->argp[2]))
+ c = 0;
+ if (!snxtitem(&nstr, EF_SHIP, player->argp[2], NULL))
return RET_SYN;
count = 0;
- while (nxtitem(&nstr, (s_char *)&ship)) {
+ while (nxtitem(&nstr, &ship)) {
if (!player->owner)
continue;
- ship.shp_fleet = c;
- snxtitem(&ni, EF_SHIP, cp);
- while ((r = nxtitem(&ni, (s_char *)&ship2))
- && (ship2.shp_fleet != c)) ;
- if (r) {
- memcpy(ship.shp_rpath, ship2.shp_rpath, sizeof(ship.shp_rpath));
- ship.shp_rflags = ship2.shp_rflags;
+ if (ship.shp_fleet == c)
+ continue;
+ ship.shp_rflags &= ~RET_GROUP;
+ snxtitem_group(&ni, EF_SHIP, c);
+ while (nxtitem(&ni, &ship2)) {
+ if ((ship2.shp_rflags & RET_GROUP) == 0)
+ continue;
+ if (ship2.shp_x == ship.shp_x && ship2.shp_y == ship.shp_y) {
+ memcpy(ship.shp_rpath, ship2.shp_rpath,
+ sizeof(ship.shp_rpath));
+ ship.shp_rflags = ship2.shp_rflags;
+ break;
+ }
}
+ ship.shp_fleet = c;
putship(ship.shp_uid, &ship);
count++;
}
- pr("%d ship%s added to fleet `%c'\n", count, splur(count), c);
+ pr("%d ship%s added to fleet `%1.1s'\n", count, splur(count), &c);
return RET_OK;
}