Markus Armbruster
c6ec6a41c2
Command functions are traditionally named like the command shortened
to four characters. When this name collides with a keyword or library
function, we abbreviate more: brea(), rea(). A few are unabbreviated,
e.g. execute(). A few have different names, e.g. explain(), not
list().
Commit 23726b379 (v4.3.0) suppressed a GCC warning about carg()
colliding with its built-in function.
Ron Koenderink reported Microsoft Visual Studio 2019 fails to link:
"_carg already defined in ucrtd.lib(ucrtbased.dll)".
Time to clean this up: rename the functions to c_FOO(), where FOO is
the unabbreviated name of the command.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
87 lines
2.3 KiB
C
87 lines
2.3 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* 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.
|
|
*
|
|
* ---
|
|
*
|
|
* army.c: Add units to an army
|
|
*
|
|
* Known contributors to this file:
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <ctype.h>
|
|
#include "commands.h"
|
|
#include "land.h"
|
|
|
|
int
|
|
c_army(void)
|
|
{
|
|
struct lndstr land;
|
|
int count;
|
|
char *cp;
|
|
char c;
|
|
struct nstr_item nstr;
|
|
struct nstr_item ni;
|
|
struct lndstr land2;
|
|
char buf[1024];
|
|
|
|
cp = getstarg(player->argp[1], "army? ", buf);
|
|
if (!cp)
|
|
return RET_SYN;
|
|
c = *cp;
|
|
if (!isalpha(c) && c != '~') {
|
|
pr("Specify army, (1 alpha char or '~')\n");
|
|
return RET_SYN;
|
|
}
|
|
if (c == '~')
|
|
c = 0;
|
|
if (!snxtitem(&nstr, EF_LAND, player->argp[2], NULL))
|
|
return RET_SYN;
|
|
count = 0;
|
|
while (nxtitem(&nstr, &land)) {
|
|
if (!player->owner)
|
|
continue;
|
|
if (land.lnd_army == c)
|
|
continue;
|
|
land.lnd_rflags &= ~RET_GROUP;
|
|
snxtitem_group(&ni, EF_LAND, c);
|
|
while (nxtitem(&ni, &land2)) {
|
|
if ((land2.lnd_rflags & RET_GROUP) == 0)
|
|
continue;
|
|
if (land2.lnd_x == land.lnd_x && land2.lnd_y == land.lnd_y) {
|
|
memcpy(land.lnd_rpath, land2.lnd_rpath,
|
|
sizeof(land.lnd_rpath));
|
|
land.lnd_rflags = land2.lnd_rflags;
|
|
break;
|
|
}
|
|
}
|
|
land.lnd_army = c;
|
|
putland(land.lnd_uid, &land);
|
|
count++;
|
|
}
|
|
pr("%d unit%s added to army `%1.1s'\n", count, splur(count), &c);
|
|
return RET_OK;
|
|
}
|