diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-23 15:25:52 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-23 15:25:52 +0000 |
| commit | f2317d0d9d74c3f5d14530c14b314ad32d05ef80 (patch) | |
| tree | fa8a51810dfc5e6bb93d389b67c2815ce1d90967 /src/newgrf_industries.cpp | |
| parent | 8d072585aecc4ff35c922f482d99aef194e0a311 (diff) | |
| download | openttd-f2317d0d9d74c3f5d14530c14b314ad32d05ef80.tar.xz | |
(svn r16402) -Codechange: make Resolve a function of SpriteGroup
Diffstat (limited to 'src/newgrf_industries.cpp')
| -rw-r--r-- | src/newgrf_industries.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index a17f004de..10ae618fe 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -387,7 +387,7 @@ uint16 GetIndustryCallback(CallbackID callback, uint32 param1, uint32 param2, In object.callback_param1 = param1; object.callback_param2 = param2; - group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object); + group = SpriteGroup::Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object); if (group == NULL) return CALLBACK_FAILED; return group->GetCallbackResult(); @@ -461,7 +461,7 @@ bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspe object.callback = CBID_INDUSTRY_LOCATION; _industry_creation_random_bits = seed; - group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object); + group = SpriteGroup::Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object); /* Unlike the "normal" cases, not having a valid result means we allow * the building of the industry, as that's how it's done in TTDP. */ @@ -531,7 +531,7 @@ void IndustryProductionCallback(Industry *ind, int reason) } SB(object.callback_param2, 8, 16, loop); - const SpriteGroup *tgroup = Resolve(spec->grf_prop.spritegroup, &object); + const SpriteGroup *tgroup = SpriteGroup::Resolve(spec->grf_prop.spritegroup, &object); if (tgroup == NULL || tgroup->type != SGT_INDUSTRY_PRODUCTION) break; const IndustryProductionSpriteGroup *group = (const IndustryProductionSpriteGroup *)tgroup; |