From 87d07f19e833e377c6dc1b84acd651d804dfe90b Mon Sep 17 00:00:00 2001 From: planetmaker Date: Thu, 7 Apr 2011 22:27:54 +0000 Subject: (svn r22299) -Fix [FS#4581]: Check the availability year of all houses, not just the NewGRF houses, when making sure that at least one is available onwards from year 0 --- src/newgrf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/newgrf.cpp b/src/newgrf.cpp index c96ff3347..cecec6d55 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -7613,8 +7613,6 @@ static void FinaliseHouseArray() * On the other hand, why 1930? Just 'fix' the houses with the lowest * minimum introduction date to 0. */ - Year min_year = MAX_YEAR; - const GRFFile * const *end = _grf_files.End(); for (GRFFile **file = _grf_files.Begin(); file != end; file++) { HouseSpec **&housespec = (*file)->housespec; @@ -7632,10 +7630,11 @@ static void FinaliseHouseArray() if (!IsHouseSpecValid(hs, next1, next2, next3, (*file)->filename)) continue; _house_mngr.SetEntitySpec(hs); - if (hs->min_year < min_year) min_year = hs->min_year; } } + Year min_year = MAX_YEAR; + for (int i = 0; i < HOUSE_MAX; i++) { HouseSpec *hs = HouseSpec::Get(i); const HouseSpec *next1 = (i + 1 < HOUSE_MAX ? HouseSpec::Get(i + 1) : NULL); @@ -7653,6 +7652,7 @@ static void FinaliseHouseArray() * building_flags to zero here to make sure any house following * this one in the pool is properly handled as 1x1 house. */ hs->building_flags = TILE_NO_FLAG; + if (hs->min_year < min_year) min_year = hs->min_year; } } -- cgit v1.2.3-70-g09d2