empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change capital to take a single sector as argument

Browse source 
Capital takes a <SECTS> argument, and picks the first suitable sector
it finds there.  It fails if none can be found, or if the first one
found already is the capital (even when more suitable sectors follow).
Has always worked that way, but never documented.

I don't think the search feature is really useful, and documenting it
isn't worth my while.  Change the command to take a <SECT> argument
instead, as documented.
This commit is contained in:
Markus Armbruster 2013-01-08 14:26:19 +01:00
parent df4925d696
commit 3783652d7a
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/commands/capi.c
View file

@ -29,6 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1986 * Dave Pare, 1986
* Steve McClure, 2000 * Steve McClure, 2000
* Markus Armbruster, 2013
*/ */
#include <config.h> #include <config.h>
@ -38,22 +39,20 @@
int int
capi(void) capi(void)
{ {
char buf[1024];
char *p;
coord x, y;
struct sctstr sect; struct sctstr sect;
struct natstr *np; struct natstr *np;
struct nstr_sect nstr;
int found;
if (!snxtsct(&nstr, player->argp[1])) if (!(p = getstarg(player->argp[1], "Sector? ", buf)) ||
!sarg_xy(p, &x, &y) || !getsect(x, y, &sect))
return RET_SYN; return RET_SYN;
np = getnatp(player->cnum); if (!player->owner
found = 0; || (sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT)) {
while (!found && nxtsct(&nstr, &sect)) {
if (player->owner && (sect.sct_type == SCT_CAPIT ||
sect.sct_type == SCT_MOUNT))
found++;
}
if (!found)
return RET_FAIL; return RET_FAIL;
}
np = getnatp(player->cnum);
if (!(np->nat_flags & NF_SACKED) && if (!(np->nat_flags & NF_SACKED) &&
sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) { sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) {
pr("%s is already your capital.\n", pr("%s is already your capital.\n",