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

fix ahort to int converaion problems, fox PR

This commit is contained in:
Enno Rehling 2015-12-11 18:03:55 +01:00
parent ad74c0a25d
commit 3fafb04b57
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/region.c
View File

@ -635,12 +635,12 @@ void rsetmoney(region * r, int value)
assert(value == 0); assert(value == 0);
} }
short rherbs(const struct region *r) int rherbs(const struct region *r)
{ {
return r->land?r->land->herbs:0; return r->land?r->land->herbs:0;
} }
void rsetherbs(const struct region *r, short value) void rsetherbs(const struct region *r, int value)
{ {
if (r->land) { if (r->land) {
assert(value >= 0); assert(value >= 0);

4
src/kernel/region.h
View File

@ -201,8 +201,8 @@ extern "C" {
int rhorses(const struct region *r); int rhorses(const struct region *r);
void rsethorses(const struct region *r, int value); void rsethorses(const struct region *r, int value);
short rherbs(const struct region *r); int rherbs(const struct region *r);
void rsetherbs(const struct region *r, short value); void rsetherbs(const struct region *r, int value);
#define rbuildings(r) ((r)->buildings) #define rbuildings(r) ((r)->buildings)