mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11143) -Fix: the random bits were not set for the production callback when the NewGRF asked for it.

release/0.6
rubidium 2007-09-22 23:14:32 +00:00
parent 90602b356a
commit c00db50edc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry.h
View File

@ -82,6 +82,10 @@ enum IndustyBehaviour {
INDUSTRYBEH_AIRPLANE_ATTACKS = 1 << 11, ///< can be exploded by a military airplane (oil refinery) INDUSTRYBEH_AIRPLANE_ATTACKS = 1 << 11, ///< can be exploded by a military airplane (oil refinery)
INDUSTRYBEH_CHOPPER_ATTACKS = 1 << 12, ///< can be exploded by a military helicopter (factory) INDUSTRYBEH_CHOPPER_ATTACKS = 1 << 12, ///< can be exploded by a military helicopter (factory)
INDUSTRYBEH_CAN_SUBSIDENCE = 1 << 13, ///< can cause a subsidence (coal mine, shaft that collapses) INDUSTRYBEH_CAN_SUBSIDENCE = 1 << 13, ///< can cause a subsidence (coal mine, shaft that collapses)
/* The following flags are only used for newindustries and do no represent any normal behaviour */
INDUSTRYBEH_PROD_MULTI_HNDLING = 1 << 14, ///< Automatic production multiplier handling
INDUSTRYBEH_PRODCALLBACK_RANDOM = 1 << 15, ///< Production callback needs random bits in var 10
INDUSTRYBEH_NOBUILT_MAPCREATION = 1 << 16, ///< Do not force one instance of this type to appear on map generation
INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type
}; };

4
src/newgrf_industries.cpp
View File

@ -462,13 +462,15 @@ static int32 DerefIndProd(uint field, bool use_register)
*/ */
void IndustryProductionCallback(Industry *ind, int reason) void IndustryProductionCallback(Industry *ind, int reason)
{ {
const IndustrySpec *spec = GetIndustrySpec(ind->type);
ResolverObject object; ResolverObject object;
NewIndustryResolver(&object, ind->xy, ind); NewIndustryResolver(&object, ind->xy, ind);
if ((spec->behaviour & INDUSTRYBEH_PRODCALLBACK_RANDOM) != 0) object.callback_param1 = Random();
object.callback_param2 = reason; object.callback_param2 = reason;
for (uint loop = 0;; loop++) { for (uint loop = 0;; loop++) {
SB(object.callback_param2, 8, 16, loop); SB(object.callback_param2, 8, 16, loop);
const SpriteGroup *group = Resolve(GetIndustrySpec(ind->type)->grf_prop.spritegroup, &object); const SpriteGroup *group = Resolve(spec->grf_prop.spritegroup, &object);
if (group == NULL || group->type != SGT_INDUSTRY_PRODUCTION) break; if (group == NULL || group->type != SGT_INDUSTRY_PRODUCTION) break;
bool deref = (group->g.indprod.version == 1); bool deref = (group->g.indprod.version == 1);