forked from github/server
manually smooth out a merge of two commits trying to do the same thing.
prevent negative parents https://bugs.eressea.de/view.php?id=2183
This commit is contained in:
parent
4683e122fc
commit
7ebfdb0747
26
src/laws.c
26
src/laws.c
|
@ -710,21 +710,19 @@ void immigration(void)
|
||||||
}
|
}
|
||||||
/* Genereate some (0-6 depending on the income) peasants out of nothing */
|
/* Genereate some (0-6 depending on the income) peasants out of nothing */
|
||||||
/* if less than 50 are in the region and there is space and no monster or demon units in the region */
|
/* if less than 50 are in the region and there is space and no monster or demon units in the region */
|
||||||
int peasants = rpeasants(r);
|
if (repopulate) {
|
||||||
int income = wage(r, NULL, NULL, turn) - maintenance_cost(NULL);
|
int peasants = rpeasants(r);
|
||||||
if (repopulate && r->land && (peasants < repopulate) && maxworkingpeasants(r) > (peasants + 30) * 2 && income >= 0) {
|
int income = wage(r, NULL, NULL, turn) - maintenance_cost(NULL);
|
||||||
int badunit = 0;
|
if (income >= 0 && r->land && (peasants < repopulate) && maxworkingpeasants(r) >(peasants + 30) * 2) {
|
||||||
unit *u;
|
int badunit = 0;
|
||||||
for (u = r->units; u; u = u->next) {
|
unit *u;
|
||||||
if (!playerrace(u_race(u)) || u_race(u) == get_race(RC_DAEMON)) {
|
for (u = r->units; u; u = u->next) {
|
||||||
badunit = 1;
|
if (!playerrace(u_race(u)) || u_race(u) == get_race(RC_DAEMON)) {
|
||||||
break;
|
badunit = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
if (badunit == 0) {
|
||||||
if (badunit == 0)
|
|
||||||
{
|
|
||||||
int x = wage(r, NULL, NULL, turn) - 9;
|
|
||||||
if (x>0) {
|
|
||||||
peasants += (int)(rng_double()*x);
|
peasants += (int)(rng_double()*x);
|
||||||
rsetpeasants(r, peasants);
|
rsetpeasants(r, peasants);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue