From 30f778e933881837b33f891d9e8b0b109b5b2561 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Thu, 1 Jan 2015 21:25:42 +0000
Subject: (svn r27105) -Fix [FS#6195]: grow_counter was not properly bounded by
 growth_rate, but by some other value used to calculate growth_rate.

---
 src/town_cmd.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/town_cmd.cpp')

diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 76a6b36f4..6674c905b 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -3115,9 +3115,7 @@ static void UpdateTownGrowRate(Town *t)
 	if (t->larger_town) m /= 2;
 
 	t->growth_rate = m / (t->cache.num_houses / 50 + 1);
-	if (m <= t->grow_counter) {
-		t->grow_counter = m;
-	}
+	t->grow_counter = min(t->growth_rate, t->grow_counter);
 
 	SetBit(t->flags, TOWN_IS_GROWING);
 	SetWindowDirty(WC_TOWN_VIEW, t->index);
-- 
cgit v1.2.3-70-g09d2