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

somehow broke region.c, cannot explain how that happened

This commit is contained in:
Enno Rehling 2015-02-23 15:53:55 +01:00
parent e2421b3fe7
commit 3ee07a795d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/region.c
View File

@ -611,8 +611,9 @@ int rpeasants(const region * r)
void rsetpeasants(region * r, int value) void rsetpeasants(region * r, int value)
{ {
((r)->land ? ((r)->land->peasants = if (r->land) {
(value)) : (assert((value) >= 0), (value)), 0); r->land->peasants = value;
}
} }
int rmoney(const region * r) int rmoney(const region * r)
@ -634,8 +635,9 @@ int rhorses(const region * r)
void rsetmoney(region * r, int value) void rsetmoney(region * r, int value)
{ {
((r)->land ? ((r)->land->money = if (r->land) {
(value)) : (assert((value) >= 0), (value)), 0); r->land->money = value;
}
} }
void r_setdemand(region * r, const luxury_type * ltype, int value) void r_setdemand(region * r, const luxury_type * ltype, int value)