cpp/openttd-patchpack/source File Diff

File diff r7101:fa1c6dce9968 → r7102:73f11fdf011b

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -245,21 +245,21 @@ static void NewIndustryResolver(Resolver @@
 	res->callback_param2 = 0;
 	res->last_value      = 0;
 	res->trigger         = 0;
 	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;
 	NewIndustryResolver(&object, tile, industry);
 	object.callback = callback;
 	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;
+}