cpp/openttd-patchpack/source Changeset - r26686:b6b127422918

Changeset - r26686:b6b127422918

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Peter Nelson - 18 months ago 2022-12-12 11:17:55
peter1138@openttd.org

Change: Add extra random seed to StartupEngines().

This means that calling reset_engines will rerandomise introduction dates
and reliability.

Probably not necessary.

3 files changed with 8 insertions and 6 deletions:

src/engine.cpp

src/engine_func.h

src/saveload/oldloader_sl.cpp

0 comments (0 inline, 0 general)

src/engine.cpp

➞

Show inline comments

@@ @@ -648,8 +648,9 @@ void SetYearEngineAgingStops() @@
  * Start/initialise one engine.
  * @param e The engine to initialise.
  * @param aging_date The date used for age calculations.
  * @param seed Random seed.
  */
 void StartupOneEngine(Engine *e, Date aging_date)
+void StartupOneEngine(Engine *e, Date aging_date, uint32 seed)
+{
 	const EngineInfo *ei = &e->info;
@@ @@ -662,7 +663,7 @@ void StartupOneEngine(Engine *e, Date ag @@
 	 * Make sure they use the same randomisation of the date. */
 	SavedRandomSeeds saved_seeds;
 	SaveRandomSeeds(&saved_seeds);
 	SetRandomSeed(_settings_game.game_creation.generation_seed ^
+	SetRandomSeed(_settings_game.game_creation.generation_seed ^ seed ^
 	              ei->base_intro ^
 	              e->type ^
 	              e->GetGRFID());
@@ @@ -684,7 +685,7 @@ void StartupOneEngine(Engine *e, Date ag @@
 		re = Engine::Get(re->info.variant_id);
+	}
 	SetRandomSeed(_settings_game.game_creation.generation_seed ^
+	SetRandomSeed(_settings_game.game_creation.generation_seed ^ seed ^
 	              (re->index << 16) ^ (re->info.base_intro << 12) ^ (re->info.decay_speed << 8) ^
 	              (re->info.lifelength << 4) ^ re->info.retire_early ^
 	              e->type ^
@@ @@ -719,9 +720,10 @@ void StartupEngines() @@
+{
 	/* Aging of vehicles stops, so account for that when starting late */
 	const Date aging_date = std::min(_date, ConvertYMDToDate(_year_engine_aging_stops, 0, 1));
 	uint32 seed = Random();
 	for (Engine *e : Engine::Iterate()) {
 		StartupOneEngine(e, aging_date);
+		StartupOneEngine(e, aging_date, seed);
+	}
 	for (Engine *e : Engine::Iterate()) {
 		CalcEngineReliability(e, false);

src/engine_func.h

➞

Show inline comments

@@ @@ -27,7 +27,7 @@ bool IsEngineRefittable(EngineID engine) @@
 void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits, CargoID cargo_type, uint cargo_capacity);
 void SetYearEngineAgingStops();
 void CalcEngineReliability(Engine *e, bool new_month);
 void StartupOneEngine(Engine *e, Date aging_date);
+void StartupOneEngine(Engine *e, Date aging_date, uint32 seed);
 uint GetTotalCapacityOfArticulatedParts(EngineID engine);

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -401,7 +401,7 @@ static bool FixTTOEngines() @@
 		if (oi == 255) {
 			/* Default engine is used */
 			_date += DAYS_TILL_ORIGINAL_BASE_YEAR;
 			StartupOneEngine(e, aging_date);
+			StartupOneEngine(e, aging_date, 0);
 			CalcEngineReliability(e, false);
 			e->intro_date -= DAYS_TILL_ORIGINAL_BASE_YEAR;
 			_date -= DAYS_TILL_ORIGINAL_BASE_YEAR;

0 comments (0 inline, 0 general)