From 4a5c670d99af0ddfddc76268885a986404372164 Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 28 Apr 2002 08:10:17 +0000 Subject: [PATCH] - An die Region gegebene Pferde wurden doppelt zugeschlagen. --- src/common/gamecode/economy.c | 6 +++--- src/common/kernel/region.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index a664f821c..584fc70e6 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -509,9 +509,9 @@ give_peasants(int n, const item_type * itype, unit * src) { region *r = src->region; - if (itype == olditemtype[I_HORSE]){ - rsethorses(r, rhorses(r) + n); - } else if (itype->rtype==r_silver) { + /* horses are given to the region via itype->give! */ + + if (itype->rtype==r_silver) { rsetmoney(r, rmoney(r) + n); } } diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index 18da9af0d..dea5e694e 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -616,8 +616,9 @@ rmoney(const region * r) void rsethorses(region *r, int value) { - assert(r->land != NULL && value >= 0); - r->land->horses = value; + assert(value >= 0); + if(r->land) + r->land->horses = value; } int