mirror of https://github.com/OpenTTD/OpenTTD
(svn r10369) -Codechange: Add the IndustryType parameter to the GetIndustryCallback function.
Sometimes, the industry might not be able to provide its type, since it does not exists at allrelease/0.6
parent
191f4be3e7
commit
c1218e88e1
|
@ -248,7 +248,7 @@ static void NewIndustryResolver(ResolverObject *res, TileIndex tile, Industry *i
|
|||
res->reseed = 0;
|
||||
}
|
||||
|
||||
uint16 GetIndustryCallback(uint16 callback, uint32 param1, uint32 param2, Industry *industry, TileIndex tile)
|
||||
uint16 GetIndustryCallback(uint16 callback, uint32 param1, uint32 param2, Industry *industry, IndustryType type, TileIndex tile)
|
||||
{
|
||||
ResolverObject object;
|
||||
const SpriteGroup *group;
|
||||
|
@ -258,7 +258,7 @@ uint16 GetIndustryCallback(uint16 callback, uint32 param1, uint32 param2, Indust
|
|||
object.callback_param1 = param1;
|
||||
object.callback_param2 = param2;
|
||||
|
||||
group = Resolve(GetIndustrySpec(industry->type)->grf_prop.spritegroup, &object);
|
||||
group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object);
|
||||
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED;
|
||||
|
||||
return group->g.callback.result;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
/* in newgrf_industry.cpp */
|
||||
uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available);
|
||||
uint16 GetIndustryCallback(uint16 callback, uint32 param1, uint32 param2, Industry *industry, TileIndex tile);
|
||||
uint16 GetIndustryCallback(uint16 callback, uint32 param1, uint32 param2, Industry *industry, IndustryType type, TileIndex tile);
|
||||
uint32 GetIndustryIDAtOffset(TileIndex new_tile, TileIndex old_tile, const Industry *i);
|
||||
|
||||
/* in newgrf_industrytiles.cpp*/
|
||||
|
|
Loading…
Reference in New Issue