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

(capi, caploss): Leave updating player->nstat to next status().

Browse source
This commit is contained in:
Markus Armbruster 2007-12-08 20:11:33 +00:00
parent f36aa0f89d
commit 1476e59dce
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,6 @@ capi(void)
xyas(sect.sct_x, sect.sct_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
return RET_FAIL; return RET_FAIL;
} }
player->nstat |= CAP;
np->nat_xcap = sect.sct_x; np->nat_xcap = sect.sct_x;
np->nat_ycap = sect.sct_y; np->nat_ycap = sect.sct_y;
/* They have set a capital, so it wasn't sacked last. */ /* They have set a capital, so it wasn't sacked last. */

4
src/lib/subs/caploss.c
View file

@ -59,10 +59,8 @@ caploss(struct sctstr *sp, natid coun, char *msg)
natp = getnatp(coun); natp = getnatp(coun);
if (sp->sct_x != natp->nat_xcap || sp->sct_y != natp->nat_ycap) if (sp->sct_x != natp->nat_xcap || sp->sct_y != natp->nat_ycap)
return; return;
if (coun == player->cnum) { if (coun == player->cnum)
player->nstat &= ~CAP;
return; return;
}
if (natp->nat_flags & NF_SACKED) if (natp->nat_flags & NF_SACKED)
return; /* sacked capital, not yet reset */ return; /* sacked capital, not yet reset */
natp->nat_flags |= NF_SACKED; /* no more sacking until player resets */ natp->nat_flags |= NF_SACKED; /* no more sacking until player resets */