dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19743) -Fix: NewGrfs could access map bits of not yet constructed industries and houses during construction callbacks.

Browse Source
This commit is contained in:
frosch
2010-05-01 13:01:21 +00:00
parent 36850ba3e8
commit 7795303227
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/newgrf_industries.cpp
View File

@@ -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)