From 77953032274c3bb49c8b22ff7a2767412586c5a7 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 1 May 2010 13:01:21 +0000 Subject: (svn r19743) -Fix: NewGrfs could access map bits of not yet constructed industries and houses during construction callbacks. --- src/newgrf_industries.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/newgrf_industries.cpp') diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 5c3c0027a..9e50dd087 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -345,18 +345,23 @@ static const SpriteGroup *IndustryResolveReal(const ResolverObject *object, cons static uint32 IndustryGetRandomBits(const ResolverObject *object) { - return object->u.industry.ind == NULL ? 0 : object->u.industry.ind->random; + const Industry *ind = object->u.industry.ind; + assert(ind != NULL); + return ind->random; } static uint32 IndustryGetTriggers(const ResolverObject *object) { - return object->u.industry.ind == NULL ? 0 : object->u.industry.ind->random_triggers; + const Industry *ind = object->u.industry.ind; + assert(ind != NULL); + return ind->random_triggers; } static void IndustrySetTriggers(const ResolverObject *object, int triggers) { - if (object->u.industry.ind == NULL) return; - object->u.industry.ind->random_triggers = triggers; + Industry *ind = object->u.industry.ind; + assert(ind != NULL && ind->index != INVALID_INDUSTRY); + ind->random_triggers = triggers; } static void NewIndustryResolver(ResolverObject *res, TileIndex tile, Industry *indus, IndustryType type) -- cgit v1.2.3-70-g09d2