Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

if a unit is empty, and not a TEMP, then it is dead and cannot recruit. 

This fixes http://bugs.eressea.de/view.php?id=2010
This commit is contained in:
Enno Rehling 2014-07-06 12:39:03 -07:00
parent 9e2e7bfe97
commit 4d173cf7e2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/economy.c
View File

@ -372,13 +372,19 @@ static int do_recruiting(recruitment * recruits, int available)
use_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, use_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT,
rc->recruitcost * number); rc->recruitcost * number);
} }
add_recruits(u, number, req->qty); if (u->number == 0 && !fval(u, UFL_ISNEW)) {
dec = (int)(number * multi); /* unit is empty, and not a TEMP => it is dead, and cannot recruit */
if ((rc->ec_flags & ECF_REC_ETHEREAL) == 0) { number = 0;
recruited += dec;
} }
if (number > 0) {
add_recruits(u, number, req->qty);
dec = (int)(number * multi);
if ((rc->ec_flags & ECF_REC_ETHEREAL) == 0) {
recruited += dec;
}
get -= dec; get -= dec;
}
} }
} }
return recruited; return recruited;