(svn r16929) -Change: There is no point in not randomising engine introduction-date before 1922. Instead disable the randomisation for the first two years after game-start, so you do not have to wait for the first engine.

This commit is contained in:
frosch 2009-07-23 18:45:53 +00:00
parent fb47193e65
commit 20c1e42be1

View File

@ -492,11 +492,11 @@ void StartupOneEngine(Engine *e, Date aging_date)
e->flags = 0; e->flags = 0;
e->company_avail = 0; e->company_avail = 0;
/* The magic value of 729 days below comes from the NewGRF spec. If the /* Don't randomise the start-date in the first two years after gamestart to ensure availability
* base intro date is before 1922 then the random number of days is not * of engines in early starting games.
* added. */ * Note: TTDP uses fixed 1922 */
r = Random(); r = Random();
e->intro_date = ei->base_intro <= ConvertYMDToDate(1922, 0, 1) ? ei->base_intro : (Date)GB(r, 0, 9) + ei->base_intro; e->intro_date = ei->base_intro <= ConvertYMDToDate(_settings_game.game_creation.starting_year + 2, 0, 1) ? ei->base_intro : (Date)GB(r, 0, 9) + ei->base_intro;
if (e->intro_date <= _date) { if (e->intro_date <= _date) {
e->age = (aging_date - e->intro_date) >> 5; e->age = (aging_date - e->intro_date) >> 5;
e->company_avail = (CompanyMask)-1; e->company_avail = (CompanyMask)-1;