Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-08 01:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.

Browse Source
This commit is contained in:
rubidium 2007-07-08 19:54:51 +00:00
parent 101722039e
commit 70d6fdeca0
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/industry_cmd.cpp
View File

@ -929,11 +929,6 @@ void PlantRandomFarmField(const Industry *i)
if (tile != INVALID_TILE) PlantFarmField(tile, i->index); if (tile != INVALID_TILE) PlantFarmField(tile, i->index);
} }
static void MaybePlantFarmField(const Industry *i)
{
if (CHANCE16(1, 8)) PlantRandomFarmField(i);
}
/** /**
* Search callback function for ChopLumberMillTrees * Search callback function for ChopLumberMillTrees
* @param tile to test * @param tile to test
@ -998,10 +993,23 @@ static void ProduceIndustryGoods(Industry *i)
i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + i->production_rate[0]); i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + i->production_rate[0]);
i->produced_cargo_waiting[1] = min(0xffff, i->produced_cargo_waiting[1] + i->production_rate[1]); i->produced_cargo_waiting[1] = min(0xffff, i->produced_cargo_waiting[1] + i->production_rate[1]);
if (indbehav & INDUSTRYBEH_PLANT_FIELDS) { if ((indbehav & INDUSTRYBEH_PLANT_FIELDS) != 0) {
MaybePlantFarmField(i); bool plant;
} else if ((indbehav & INDUSTRYBEH_CUT_TREES) && (i->counter & 0x1FF) == 0) { if (HASBIT(indsp->callback_flags, CBM_IND_SPECIAL_EFFECT)) {
ChopLumberMillTrees(i); plant = (GetIndustryCallback(CBID_INDUSTRY_SPECIAL_EFFECT, Random(), 0, i, i->type, i->xy) != 0);
} else {
plant = CHANCE16(1, 8);
}
if (plant) PlantRandomFarmField(i);
}
if ((indbehav & INDUSTRYBEH_CUT_TREES) != 0) {
bool cut = ((i->counter & 0x1FF) == 0);
if (HASBIT(indsp->callback_flags, CBM_IND_SPECIAL_EFFECT)) {
cut = (GetIndustryCallback(CBID_INDUSTRY_SPECIAL_EFFECT, 0, 1, i, i->type, i->xy) != 0);
}
if (cut) ChopLumberMillTrees(i);
} }
} }
} }

2
src/newgrf_callbacks.h
View File

@ -153,7 +153,7 @@ enum CallbackID {
CBID_INDUSTRY_WINDOW_MORE_TEXT = 0x3A, CBID_INDUSTRY_WINDOW_MORE_TEXT = 0x3A,
/* Called to determine industry special effects */ /* Called to determine industry special effects */
CBID_INDUSTRY_SPECIAL_EFFECT = 0x3B, // not yet implemented CBID_INDUSTRY_SPECIAL_EFFECT = 0x3B,
/* Called to determine if industry can alter the ground below industry tile */ /* Called to determine if industry can alter the ground below industry tile */
CBID_INDUSTRY_AUTOSLOPE = 0x3C, // not yet implemented CBID_INDUSTRY_AUTOSLOPE = 0x3C, // not yet implemented