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

Distinguish between sacking and obliterating a capital

Browse source 
Make caploss() transfer money, loans and market lots to the player
only if he actually took the capital, not if he obliterated it to
deity.

To make this work, caploss() needs to be called after the sector is
updated for damage and change of ownership.  Change callers
accordingly.

Closes #914049.
This commit is contained in:
Markus Armbruster 2008-05-11 10:48:30 +02:00
parent f6308422c3
commit 221e88f106
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,6 +91,7 @@ static int
checksect(struct sctstr *sp)
{
int mil, civs, loyalcivs;
natid own;
item_prewrite(sp->sct_item);
@ -113,9 +114,7 @@ checksect(struct sctstr *sp)
if (sp->sct_own && !loyalcivs && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
if (!mil && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, 0)) {
/* more cruft! */
if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
caploss(sp, sp->sct_own, "");
own = sp->sct_own;
if (sp->sct_oldown == sp->sct_own) {
makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
sp->sct_own = 0;
@ -123,6 +122,8 @@ checksect(struct sctstr *sp)
} else
takeover(sp, sp->sct_oldown);
sp->sct_mobil = 0;
if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
caploss(sp, own, "");
}
}
return 1;