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

(svn r11716) -Fix [FS#1561]: don't put more than one Random() in function calls because parameter evaluation order is not guaranteed in the c++ standard (can lead to desyncs)

release/0.6
glx 2007-12-28 16:21:29 +00:00
parent 8e1f21e29b
commit c87f20ff37
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/industry_cmd.cpp
View File

@ -1612,7 +1612,11 @@ CommandCost CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
* is nothing we can really do about that. */ * is nothing we can really do about that. */
if (Random() <= indspec->prospecting_chance) { if (Random() <= indspec->prospecting_chance) {
for (int i = 0; i < 5000; i++) { for (int i = 0; i < 5000; i++) {
const Industry *ind = CreateNewIndustryHelper(RandomTile(), p1, flags, indspec, RandomRange(indspec->num_table)); /* We should not have more than one Random() in a function call
* because parameter evaluation order is not guaranteed in the c++ standard
*/
tile = RandomTile();
const Industry *ind = CreateNewIndustryHelper(tile, p1, flags, indspec, RandomRange(indspec->num_table));
if (ind != NULL) { if (ind != NULL) {
SetDParam(0, indspec->name); SetDParam(0, indspec->name);
if (indspec->new_industry_text > STR_LAST_STRINGID) { if (indspec->new_industry_text > STR_LAST_STRINGID) {