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

Merge pull request #459 from ennorehling/master

Browse source 
Workaround and additional assertions for bug 2182
This commit is contained in:
Enno Rehling 2016-01-24 14:50:54 +01:00
commit c4ad655456
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/kernel/region.c
View file

@ -595,14 +595,20 @@ bool is_coastregion(region * r)
int rpeasants(const region * r)
{
return ((r)->land ? (r)->land->peasants : 0);
int value = 0;
if (r->land) {
value = r->land->peasants;
assert(value >= 0);
}
return value;
}
void rsetpeasants(region * r, int value)
{
if (r->land) r->land->peasants = value;
else assert(value>=0);
assert(value >= 0);
if (r->land) {
r->land->peasants = value;
}
}
int rmoney(const region * r)
@ -612,9 +618,11 @@ int rmoney(const region * r)
void rsethorses(const region * r, int value)
{
assert(r->land || value==0);
assert(value >= 0);
if (r->land)
if (r->land) {
r->land->horses = value;
}
}
int rhorses(const region * r)

12
src/kernel/save.c
View file

@ -944,15 +944,19 @@ static region *readregion(struct gamedata *data, int x, int y)
READ_INT(data->store, &n);
rsetherbs(r, (short)n);
READ_INT(data->store, &n);
rsetpeasants(r, n);
if (n < 0) {
/* bug 2182 */
log_error("data has negative peasants: %d in %s", n, regionname(r, 0));
rsetpeasants(r, 0);
}
else {
rsetpeasants(r, n);
}
READ_INT(data->store, &n);
rsetmoney(r, n);
}
assert(r->terrain != NULL);
assert(rhorses(r) >= 0);
assert(rpeasants(r) >= 0);
assert(rmoney(r) >= 0);
if (r->land) {
int n;