cpp/openttd-patchpack/source Changeset - r2990:093bed7dfa90

Changeset - r2990:093bed7dfa90

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

peter1138 - 18 years ago 2006-02-06 10:05:41
peter1138@openttd.org

(svn r3565) - Fix: On loading a game, GetPlayerRailtypes() didn't account for the fact that vehicles are introduced a year after their introduction date. This will also relieve possible (rare) network desyncs.

2 files changed with 2 insertions and 2 deletions:

engine.c

players.c

0 comments (0 inline, 0 general)

engine.c

➞

Show inline comments

@@ @@ -428,7 +428,7 @@ void EnginesMonthlyLoop(void) @@
 				CalcEngineReliability(e);
+			}
-			if (!(e->flags & ENGINE_AVAILABLE) && (uint16)(_date - min(_date, 365)) >= e->intro_date) {
+			if (!(e->flags & ENGINE_AVAILABLE) && _date >= (e->intro_date + 365)) {
 				// Introduce it to all players
 				NewVehicleAvailable(e);
 			} else if (!(e->flags & (ENGINE_AVAILABLE|ENGINE_INTRODUCING)) && _date >= e->intro_date) {

players.c

➞

Show inline comments

@@ @@ -628,7 +628,7 @@ byte GetPlayerRailtypes(PlayerID p) @@
 		const EngineInfo *ei = &_engine_info[i];
 		if (e->type == VEH_Train && HASBIT(ei->climates, _opt.landscape) &&
-				(HASBIT(e->player_avail, p) || e->intro_date <= _date) &&
+				(HASBIT(e->player_avail, p) || _date >= (e->intro_date + 365)) &&
 				!(RailVehInfo(i)->flags & RVI_WAGON)) {
 			assert(e->railtype < RAILTYPE_END);
 			SETBIT(rt, e->railtype);

0 comments (0 inline, 0 general)