cpp/openttd-patchpack/source Changeset - r7102:73f11fdf011b

Changeset - r7102:73f11fdf011b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 17 years ago 2007-06-28 02:14:40
belugas@openttd.org

(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 all

2 files changed with 3 insertions and 3 deletions:

src/newgrf_industries.cpp

src/newgrf_industries.h

0 comments (0 inline, 0 general)

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -248,7 +248,7 @@ static void NewIndustryResolver(Resolver @@
 	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 callba @@
 	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;

src/newgrf_industries.h

➞

Show inline comments

@@ @@ -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*/

0 comments (0 inline, 0 general)