From 3fafb04b578dc7d143ef2a3ca824bc45787b79f1 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 11 Dec 2015 18:03:55 +0100 Subject: [PATCH] fix ahort to int converaion problems, fox PR --- src/kernel/region.c | 4 ++-- src/kernel/region.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/region.c b/src/kernel/region.c index 4b26cf8c9..aa4c86425 100644 --- a/src/kernel/region.c +++ b/src/kernel/region.c @@ -635,12 +635,12 @@ void rsetmoney(region * r, int value) assert(value == 0); } -short rherbs(const struct region *r) +int rherbs(const struct region *r) { 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) { assert(value >= 0); diff --git a/src/kernel/region.h b/src/kernel/region.h index 61235d5b2..5974fd96c 100644 --- a/src/kernel/region.h +++ b/src/kernel/region.h @@ -201,8 +201,8 @@ extern "C" { int rhorses(const struct region *r); void rsethorses(const struct region *r, int value); - short rherbs(const struct region *r); - void rsetherbs(const struct region *r, short value); + int rherbs(const struct region *r); + void rsetherbs(const struct region *r, int value); #define rbuildings(r) ((r)->buildings)