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

borken merge fix

This commit is contained in:
Enno Rehling 2016-01-24 14:55:43 +01:00
parent a66e81e90d
commit cc4367f1b7
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kernel/region.c
View File

@ -595,27 +595,19 @@ bool is_coastregion(region * r)
int rpeasants(const region * r) int rpeasants(const region * r)
{ {
<<<<<<< HEAD
return r->land ? r->land->peasants : 0;
=======
int value = 0; int value = 0;
if (r->land) { if (r->land) {
value = r->land->peasants; value = r->land->peasants;
assert(value >= 0); assert(value >= 0);
} }
return value; return value;
>>>>>>> master
} }
void rsetpeasants(region * r, int value) void rsetpeasants(region * r, int value)
{ {
<<<<<<< HEAD assert(r->land || value==0);
if (r->land) {
assert(value >= 0);
=======
assert(value >= 0); assert(value >= 0);
if (r->land) { if (r->land) {
>>>>>>> master
r->land->peasants = value; r->land->peasants = value;
} }
} }
@ -627,14 +619,9 @@ int rmoney(const region * r)
void rsethorses(const region * r, int value) void rsethorses(const region * r, int value)
{ {
<<<<<<< HEAD
if (r->land) {
assert(value >= 0);
=======
assert(r->land || value==0); assert(r->land || value==0);
assert(value >= 0); assert(value >= 0);
if (r->land) { if (r->land) {
>>>>>>> master
r->land->horses = value; r->land->horses = value;
} }
} }