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

Fix transfer of loans and market lots on sack of capital

Browse source 
Fix caploss() to transfer only signed loans.  Before, it transferred
any loan with a non-zero duration, which included loan offers, and
could claim to tranfer nonexistent loans.

Fix caploss() not to claim transfer of nonexistant market lots when
country 0 sacks a capital.
This commit is contained in:
Markus Armbruster 2008-05-11 10:30:32 +02:00
parent a16af46af9
commit f6308422c3
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ caploss(struct sctstr *sp, natid coun, char *msg)
cname(player->cnum), cname(coun), -(int)(player->dolcost)); cname(player->cnum), cname(coun), -(int)(player->dolcost));
if (opt_LOANS) { if (opt_LOANS) {
for (loan_num = 0; getloan(loan_num, &loan); loan_num++) { for (loan_num = 0; getloan(loan_num, &loan); loan_num++) {
if (loan.l_ldur != 0 && loan.l_loner == coun) { if (loan.l_status == LS_SIGNED && loan.l_loner == coun) {
loan.l_loner = player->cnum; loan.l_loner = player->cnum;
putloan(loan_num, &loan); putloan(loan_num, &loan);
pr("Loan %d has been transfered over to you\n", loan_num); pr("Loan %d has been transfered over to you\n", loan_num);
@ -93,6 +93,8 @@ caploss(struct sctstr *sp, natid coun, char *msg)
} }
if (opt_MARKET) { if (opt_MARKET) {
for (comm_num = 0; getcomm(comm_num, &comm); comm_num++) { for (comm_num = 0; getcomm(comm_num, &comm); comm_num++) {
if (comm.com_owner == 0)
continue;
if (comm.com_owner == coun) { if (comm.com_owner == coun) {
if (comm.com_owner == comm.com_maxbidder) if (comm.com_owner == comm.com_maxbidder)
comm.com_maxbidder = player->cnum; comm.com_maxbidder = player->cnum;