From eea1a772f26e76a9939f7a3472cf31dd43c349a6 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 1 May 2010 17:53:25 +0000 Subject: (svn r19748) -Fix (r19743): Callback 22 and 38 are called with ind == NULL. --- src/newgrf_industries.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index f7419149d..d9aa81477 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -346,15 +346,13 @@ static const SpriteGroup *IndustryResolveReal(const ResolverObject *object, cons static uint32 IndustryGetRandomBits(const ResolverObject *object) { const Industry *ind = object->u.industry.ind; - assert(ind != NULL); - return ind->random; + return ind != NULL ? ind->random: 0; } static uint32 IndustryGetTriggers(const ResolverObject *object) { const Industry *ind = object->u.industry.ind; - assert(ind != NULL); - return ind->random_triggers; + return ind != NULL ? ind->random_triggers : 0; } static void IndustrySetTriggers(const ResolverObject *object, int triggers) -- cgit v1.2.3-54-g00ecf