cpp/openttd-patchpack/source Changeset - r22493:6b25980b7194

Changeset - r22493:6b25980b7194

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 8 years ago 2016-12-20 12:35:36
frosch@openttd.org

(svn r27700) -Codechange: Simplify railtype date introduction. A check that is safe to run every day before the last railtype has been introduced, is also safe to run after the last railtype has been introduced.

1 file changed with 4 insertions and 42 deletions:

src/engine.cpp

0 comments (0 inline, 0 general)

src/engine.cpp

➞

Show inline comments

@@ @@ -48,11 +48,6 @@ EngineOverrideManager _engine_mngr; @@
  */
 static Year _year_engine_aging_stops;
 /**
  * The railtypes that have been or never will be introduced, or
  * an inverse bitmap of rail types that have to be introduced. */
 static uint16 _introduced_railtypes;
 /** Number of engines of each vehicle type in original engine data */
 const uint8 _engine_counts[4] = {
 	lengthof(_orig_rail_vehicle_info),
@@ @@ -543,29 +538,6 @@ void SetupEngines() @@
 		const Engine *e = new Engine(eid->type, eid->internal_id);
 		assert(e->index == index);
+	}
 	_introduced_railtypes = 0;
+}
 /**
  * Check whether the railtypes should be introduced.
  */
 static void CheckRailIntroduction()
+{
 	/* All railtypes have been introduced. */
 	if (_introduced_railtypes == UINT16_MAX || Company::GetPoolSize() == 0) return;
 	/* We need to find the railtypes that are known to all companies. */
 	RailTypes rts = (RailTypes)UINT16_MAX;
 	/* We are at, or past the introduction date of the rail. */
 	Company *c;
 	FOR_ALL_COMPANIES(c) {
 		c->avail_railtypes = AddDateIntroducedRailTypes(c->avail_railtypes, _date);
 		rts &= c->avail_railtypes;
+	}
 	_introduced_railtypes |= rts;
+}
 void ShowEnginePreviewWindow(EngineID engine);
@@ @@ -711,19 +683,6 @@ void StartupEngines() @@
 		c->avail_roadtypes = GetCompanyRoadtypes(c->index);
+	}
 	/* Rail types that are invalid or never introduced are marked as
 	 * being introduced upon start. That way we can easily check whether
 	 * there is any date related introduction that is still going to
 	 * happen somewhere in the future. */
 	for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
 		const RailtypeInfo *rti = GetRailTypeInfo(rt);
 		if (rti->label != 0 && IsInsideMM(rti->introduction_date, 0, MAX_DAY)) continue;
 		SetBit(_introduced_railtypes, rt);
+	}
 	CheckRailIntroduction();
 	/* Invalidate any open purchase lists */
 	InvalidateWindowClassesData(WC_BUILD_VEHICLE);
+}
@@ @@ -820,7 +779,10 @@ static bool IsVehicleTypeDisabled(Vehicl @@
 /** Daily check to offer an exclusive engine preview to the companies. */
 void EnginesDailyLoop()
+{
 	CheckRailIntroduction();
 	Company *c;
 	FOR_ALL_COMPANIES(c) {
 		c->avail_railtypes = AddDateIntroducedRailTypes(c->avail_railtypes, _date);
+	}
 	if (_cur_year >= _year_engine_aging_stops) return;

0 comments (0 inline, 0 general)