summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2007-06-28 02:14:40 +0000
committerbelugas <belugas@openttd.org>2007-06-28 02:14:40 +0000
commitc1218e88e1a15f1c759868aff7d93d2faf61bcf7 (patch)
tree9b1d3192acc092506476fa6fe6ae2b0d81f0c30b /src
parent191f4be3e78c47339b89020a6bbc478c0f087f8f (diff)
downloadopenttd-c1218e88e1a15f1c759868aff7d93d2faf61bcf7.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_industries.cpp4
-rw-r--r--src/newgrf_industries.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 402bccccb..61f3ae224 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -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;
diff --git a/src/newgrf_industries.h b/src/newgrf_industries.h
index 54a54cbf8..5da4cef1a 100644
--- a/src/newgrf_industries.h
+++ b/src/newgrf_industries.h
@@ -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*/