#include "optlist.h"
static int checksect(struct sctstr *);
-static void give_back_cap(struct sctstr *sp);
/*ARGSUSED*/
int
makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
sp->sct_own = 0;
sp->sct_oldown = 0;
- } else {
- /* if oldown gets his cap back make agri */
- if (sp->sct_oldown &&
- player->cnum == sp->sct_own &&
- sp->sct_type == SCT_CAPIT &&
- sp->sct_newtype == SCT_CAPIT)
- give_back_cap(sp);
+ } else
takeover(sp, sp->sct_oldown);
- }
sp->sct_mobil = 0;
}
}
return 0;
}
-static void
-give_back_cap(struct sctstr *sp)
-{
- struct natstr *natp = getnatp(sp->sct_oldown);
-
- if (xrel(natp, natp->nat_xcap) == xrel(natp, sp->sct_x) &&
- yrel(natp, natp->nat_ycap) == yrel(natp, sp->sct_y)) {
- sp->sct_newtype = SCT_AGRI;
- }
-}
-
void
sct_init(coord x, coord y, s_char *ptr)
{
sp->sct_mobil = oldmob;
civ += uw;
uw = 0;
- /*
- * so we can't keep losing money by having
- * our cap retaken
- */
- if (sp->sct_type == SCT_CAPIT && sp->sct_newtype == SCT_CAPIT)
- sp->sct_newtype = SCT_AGRI;
n = civ / 20;
civ -= n;
if (civ > ITEM_MAX) {