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

(do_conv): Use maximum population instead of 999 to limit number of

Browse source 
new uw.
This commit is contained in:
Markus Armbruster 2005-08-30 17:49:43 +00:00
parent 41c67326bb
commit a508a4c6e7
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/lib/commands/conv.c
View file

@ -72,23 +72,24 @@ conv(void)
static long static long
do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real) do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real)
{ {
struct natstr *natp;
struct sctstr sect; struct sctstr sect;
int newuw, totaluw, uw; int newuw, totaluw, uw;
int civ, mil, adj_mob, mob; int maxpop, civ, mil, adj_mob, mob;
double security_extra = 1.0; double security_extra = 1.0;
struct lndstr land; struct lndstr land;
struct nstr_item ni; struct nstr_item ni;
long cost = 0; long cost = 0;
natp = getnatp(sect.sct_own);
totaluw = 0; totaluw = 0;
while (nxtsct(&nstr, &sect)) { while (nxtsct(&nstr, &sect)) {
if (!player->owner) if (!player->owner)
continue; continue;
if (sect.sct_oldown == player->cnum) if (sect.sct_oldown == player->cnum)
continue; continue;
maxpop = max_pop(natp->nat_level[NAT_RLEV], &sect);
civ = sect.sct_item[I_CIVIL]; civ = sect.sct_item[I_CIVIL];
if (civ == 0)
continue;
mil = sect.sct_item[I_MILIT]; mil = sect.sct_item[I_MILIT];
/* /*
@ -99,8 +100,6 @@ do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real)
snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y); snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);
while (nxtitem(&ni, &land)) { while (nxtitem(&ni, &land)) {
mil += lnd_getmil(&land); mil += lnd_getmil(&land);
/* mil += (lnd_getmil(&land) *
((double)land.lnd_effic/100.0));*/
/* Anti-terrorist units count double */ /* Anti-terrorist units count double */
if (lchr[(int)land.lnd_type].l_flags & L_SECURITY) { if (lchr[(int)land.lnd_type].l_flags & L_SECURITY) {
@ -115,8 +114,6 @@ do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real)
if (for_real) if (for_real)
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
mil += lnd_getmil(&land); mil += lnd_getmil(&land);
/* mil += (lchr[land.lnd_type].l_mil *
((double)land.lnd_effic/100.0));*/
} }
} }
/* /*
@ -128,11 +125,9 @@ do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real)
if (newuw > uwtoconvert) if (newuw > uwtoconvert)
newuw = uwtoconvert; newuw = uwtoconvert;
uw = sect.sct_item[I_UW]; uw = sect.sct_item[I_UW];
if (uw > 999) if (newuw > maxpop - uw)
continue; newuw = maxpop - uw;
if (newuw > 999 - uw) if (newuw <= 0)
newuw = 999 - uw;
if (newuw == 0)
continue; continue;
/* /*
* So entire civilian populations don't disappear immediately * So entire civilian populations don't disappear immediately