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

fix https://bugs.eressea.de/view.php?id=2183

This commit is contained in:
Enno Rehling 2016-01-30 23:04:41 +01:00
parent f3ab4d5ca6
commit c557778731
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/kernel/item.c
View File

@ -567,11 +567,15 @@ struct order *ord)
{
if (d == NULL) {
int use = use_pooled(s, item2resource(itype), GET_SLACK, n);
if (use < n)
region *r = s->region;
if (use < n) {
use +=
use_pooled(s, item2resource(itype), GET_RESERVE | GET_POOLED_SLACK,
n - use);
rsethorses(s->region, rhorses(s->region) + use);
}
if (r->land) {
rsethorses(r, rhorses(r) + use);
}
return 0;
}
return -1; /* use the mechanism */
@ -583,11 +587,15 @@ struct order *ord)
{
if (d == NULL) {
int use = use_pooled(s, item2resource(itype), GET_SLACK, n);
if (use < n)
region *r = s->region;
if (use < n) {
use +=
use_pooled(s, item2resource(itype), GET_RESERVE | GET_POOLED_SLACK,
n - use);
rsetmoney(s->region, rmoney(s->region) + use);
}
if (r->land) {
rsetmoney(r, rmoney(r) + use);
}
return 0;
}
return -1; /* use the mechanism */

7
src/laws.c
View File

@ -720,8 +720,11 @@ void immigration(void)
}
if (badunit == 0)
{
peasants += (int)(rng_double()*(wage(r, NULL, NULL, turn) - 9));
rsetpeasants(r, peasants);
int x = wage(r, NULL, NULL, turn) - 9;
if (x>0) {
peasants += (int)(rng_double()*x);
rsetpeasants(r, peasants);
}
}
}
}