(svn r19748) -Fix (r19743): Callback 22 and 38 are called with ind == NULL.

14 years ago · 43822a2e6f
parent 7d14a91ad9
commit 43822a2e6f
1 changed files with 2 additions and 4 deletions
--- 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)