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

let horses be short, too.

This commit is contained in:
Enno Rehling 2019-08-03 20:58:13 +02:00
parent 8106cf15a1
commit c97e881dbf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/region.c
View File

@ -643,7 +643,11 @@ void rsethorses(const region * r, int value)
assert(r->land || value==0); assert(r->land || value==0);
assert(value >= 0); assert(value >= 0);
if (r->land) { if (r->land) {
r->land->horses = value; if (value > USHRT_MAX) {
log_warning("region %s cannot have %d horses.", regionname(r, NULL), value);
value = USHRT_MAX;
}
r->land->horses = (unsigned short)value;
} }
} }

2
src/kernel/region.h
View File

@ -97,12 +97,12 @@ extern "C" {
char *display; char *display;
demand *demands; demand *demands;
const struct item_type *herbtype; const struct item_type *herbtype;
unsigned short horses;
unsigned short herbs; unsigned short herbs;
unsigned short peasants; unsigned short peasants;
unsigned short morale; unsigned short morale;
short newpeasants; short newpeasants;
int trees[3]; /* 0 -> seeds, 1 -> shoots, 2 -> trees */ int trees[3]; /* 0 -> seeds, 1 -> shoots, 2 -> trees */
int horses;
int money; int money;
struct region_owner *ownership; struct region_owner *ownership;
} land_region; } land_region;