From edb862a8fcbd79089cc0044395b7f3fa4494b6d2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 9 Nov 2015 20:08:58 +0100 Subject: [PATCH] CID 22461 Division or modulo by zero partial fix github issue #326 also fewer calls to rmoney --- src/economy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/economy.c b/src/economy.c index c6e0d360a..9a9c5857a 100644 --- a/src/economy.c +++ b/src/economy.c @@ -2898,11 +2898,12 @@ static void expandloot(region * r, request * lootorders) if (!norders) return; - for (i = 0; i != norders && rmoney(r) > TAXFRACTION * 2; i++) { + for (i = 0; i != norders && startmoney > TAXFRACTION * 2; i++) { change_money(oa[i].unit, TAXFRACTION); oa[i].unit->n += TAXFRACTION; /*Looting destroys double the money*/ - rsetmoney(r, rmoney(r) - TAXFRACTION * 2); + startmoney = startmoney - TAXFRACTION * 2; + rsetmoney(r, startmoney); looted = looted + TAXFRACTION * 2; } free(oa);