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

(svn r12362) -Fix (r11985, r12006): Randomize variable 8F only once per callback 28.

Browse Source
This commit is contained in:
frosch 2008-03-12 15:56:56 +00:00
parent 8af1696cd3
commit d744451345
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_industries.cpp
View File

@ -25,7 +25,7 @@
#include "table/strings.h" #include "table/strings.h"
static Randomizer _industry_creation_randomizer; static uint32 _industry_creation_random_bits;
/* Since the industry IDs defined by the GRF file don't necessarily correlate /* Since the industry IDs defined by the GRF file don't necessarily correlate
* to those used by the game, the IDs used for overriding old industries must be * to those used by the game, the IDs used for overriding old industries must be
@ -469,7 +469,7 @@ uint32 IndustryLocationGetVariable(const ResolverObject *object, byte variable,
case 0x8D: return min(DistanceSquare(industry->town->xy, tile), 65535); case 0x8D: return min(DistanceSquare(industry->town->xy, tile), 65535);
/* 32 random bits */ /* 32 random bits */
case 0x8F: return _industry_creation_randomizer.Next(); case 0x8F: return _industry_creation_random_bits;
} }
/* None of the special ones, so try the general ones */ /* None of the special ones, so try the general ones */
@ -494,7 +494,7 @@ bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspe
NewIndustryResolver(&object, tile, &ind, type); NewIndustryResolver(&object, tile, &ind, type);
object.GetVariable = IndustryLocationGetVariable; object.GetVariable = IndustryLocationGetVariable;
object.callback = CBID_INDUSTRY_LOCATION; object.callback = CBID_INDUSTRY_LOCATION;
_industry_creation_randomizer.SetSeed(seed); _industry_creation_random_bits = seed;
group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object); group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object);