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

(checksect, give_back_cap, guerrilla): No longer change capital to

Browse source 
agribusiness.  That was done when the occupier abandons the old-owners
capital or it revolts, to prevent players from sacking the same
capital many timers.  The server has a much better way to prevent that
since 4.2.7, so this weird hack is no longer useful.  Thanks to Pat
Loney for pointing this out.
This commit is contained in:
Markus Armbruster 2005-07-31 13:55:50 +00:00
parent fd81bf86eb
commit 591c82bf7c
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/subs/sect.c
View file

@ -45,7 +45,6 @@
#include "optlist.h" #include "optlist.h"
static int checksect(struct sctstr *); static int checksect(struct sctstr *);
static void give_back_cap(struct sctstr *sp);
/*ARGSUSED*/ /*ARGSUSED*/
int int
@ -128,15 +127,8 @@ checksect(struct sctstr *sp)
makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y); makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
sp->sct_own = 0; sp->sct_own = 0;
sp->sct_oldown = 0; sp->sct_oldown = 0;
} else { } 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);
takeover(sp, sp->sct_oldown); takeover(sp, sp->sct_oldown);
}
sp->sct_mobil = 0; sp->sct_mobil = 0;
} }
} }
@ -157,17 +149,6 @@ issector(s_char *arg)
return 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 void
sct_init(coord x, coord y, s_char *ptr) sct_init(coord x, coord y, s_char *ptr)
{ {

6
src/lib/update/revolt.c
View file

@ -332,12 +332,6 @@ guerrilla(struct sctstr *sp)
sp->sct_mobil = oldmob; sp->sct_mobil = oldmob;
civ += uw; civ += uw;
uw = 0; 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; n = civ / 20;
civ -= n; civ -= n;
if (civ > ITEM_MAX) { if (civ > ITEM_MAX) {