forked from github/server
fix terrible code to avoid gcc 4.9 warning
This commit is contained in:
parent
6953ad4403
commit
76cce7f239
|
@ -611,8 +611,8 @@ int rpeasants(const region * r)
|
|||
|
||||
void rsetpeasants(region * r, int value)
|
||||
{
|
||||
((r)->land ? ((r)->land->peasants =
|
||||
(value)) : (assert((value) >= 0), (value)), 0);
|
||||
if (r->land) r->land->peasants = value;
|
||||
else assert(value>=0);
|
||||
}
|
||||
|
||||
int rmoney(const region * r)
|
||||
|
@ -634,8 +634,8 @@ int rhorses(const region * r)
|
|||
|
||||
void rsetmoney(region * r, int value)
|
||||
{
|
||||
((r)->land ? ((r)->land->money =
|
||||
(value)) : (assert((value) >= 0), (value)), 0);
|
||||
if (r->land) r->land->money = value;
|
||||
else assert(value >= 0);
|
||||
}
|
||||
|
||||
void r_setdemand(region * r, const luxury_type * ltype, int value)
|
||||
|
|
Loading…
Reference in New Issue