diff options
| author | darkvater <darkvater@openttd.org> | 2004-09-16 15:15:04 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2004-09-16 15:15:04 +0000 |
| commit | 1cfc87708899e41ced571ff421f628daf7767042 (patch) | |
| tree | 98e4cb5d8483c5626b89182fcc9573de4fd47459 | |
| parent | 21b905e963737caf9d593aa2640848fb96096bcc (diff) | |
| download | openttd-1cfc87708899e41ced571ff421f628daf7767042.tar.xz | |
(svn r272) -Fix: industries are once again generated on a new map
| -rw-r--r-- | industry_cmd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/industry_cmd.c b/industry_cmd.c index 922e5d1cb..c8f40321f 100644 --- a/industry_cmd.c +++ b/industry_cmd.c @@ -1584,6 +1584,8 @@ static void PlaceInitialIndustry(byte type, int amount) if (_opt.diff.number_industries != 0) { + byte old_player = _current_player; + _current_player = OWNER_NONE; assert(num > 0); do { @@ -1593,6 +1595,8 @@ static void PlaceInitialIndustry(byte type, int amount) break; } while (--i != 0); } while (--num); + + _current_player = OWNER_NONE; } } @@ -1728,7 +1732,6 @@ static void MaybeNewIndustry(uint32 r) return; j = 2000; - _current_player = OWNER_NONE; for(;;) { i = CreateNewIndustry(TILE_MASK(Random()), type); if (i != NULL) @@ -1800,6 +1803,8 @@ add_news: void IndustryMonthlyLoop() { Industry *i; + byte old_player = _current_player; + _current_player = OWNER_NONE; for(i=_industries; i != endof(_industries); i++) { if (i->xy != 0) @@ -1815,6 +1820,9 @@ void IndustryMonthlyLoop() } else if (!_patches.smooth_economy) { MaybeCloseIndustry(i); } + + _current_player = old_player; + // production-change _industry_sort_dirty = true; InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |