(svn r11608) -Fix: do not trigger industries, but only the industry's tiles.
--- a/src/newgrf_industries.cpp Sun Dec 09 17:07:50 2007 +0000
+++ b/src/newgrf_industries.cpp Sun Dec 09 18:27:40 2007 +0000
@@ -535,19 +535,3 @@
InvalidateWindow(WC_INDUSTRY_VIEW, ind->index);
}
-
-void DoTriggerIndustry(Industry *ind, IndustryTileTrigger trigger)
-{
- ResolverObject object;
-
- NewIndustryResolver(&object, ind->xy, ind);
- object.callback = CBID_RANDOM_TRIGGER;
- object.trigger = trigger;
-
- const SpriteGroup *group = Resolve(GetIndustrySpec(ind->type)->grf_prop.spritegroup, &object);
- if (group == NULL) return;
-
- byte new_random_bits = Random();
- ind->random &= ~object.reseed;
- ind->random |= new_random_bits & object.reseed;
-}
--- a/src/newgrf_industrytiles.cpp Sun Dec 09 17:07:50 2007 +0000
+++ b/src/newgrf_industrytiles.cpp Sun Dec 09 18:27:40 2007 +0000
@@ -413,8 +413,6 @@
DoTriggerIndustryTile(tile, trigger, GetIndustryByTile(tile));
}
-extern void DoTriggerIndustry(Industry *ind, IndustryTileTrigger trigger);
-
void TriggerIndustry(Industry *ind, IndustryTileTrigger trigger)
{
BEGIN_TILE_LOOP(tile, ind->width, ind->height, ind->xy)
@@ -422,6 +420,4 @@
DoTriggerIndustryTile(tile, trigger, ind);
}
END_TILE_LOOP(tile, ind->width, ind->height, ind->xy)
-
- DoTriggerIndustry(ind, trigger);
}