/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* wing.c: Add planes to a wing
- *
+ *
* Known contributors to this file:
- *
+ *
*/
+#include <config.h>
+
#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
#include "commands.h"
+#include "plane.h"
int
wing(void)
struct plnstr plane;
int count;
- s_char *cp;
- s_char c;
+ char *cp;
+ char c;
struct nstr_item nstr;
- s_char buf[1024];
+ char buf[1024];
if (!(cp = getstarg(player->argp[1], "wing? ", buf)))
return RET_SYN;
return RET_SYN;
}
if (c == '~')
- c = ' ';
- if (!snxtitem(&nstr, EF_PLANE, player->argp[2]))
+ c = 0;
+ if (!snxtitem(&nstr, EF_PLANE, player->argp[2], NULL))
return RET_SYN;
- for (count = 0; nxtitem(&nstr, (s_char *)&plane); count++) {
- if (plane.pln_own != player->cnum) {
- count--;
+ count = 0;
+ while (nxtitem(&nstr, &plane)) {
+ if (plane.pln_own != player->cnum)
+ continue;
+ if (plane.pln_wing == c)
continue;
- }
plane.pln_wing = c;
putplane(plane.pln_uid, &plane);
+ count++;
}
- pr("%d plane%s added to wing `%c'\n", count, splur(count), c);
+ pr("%d plane%s added to wing `%1.1s'\n", count, splur(count), &c);
return RET_OK;
}