Mercurial > hg > openttd

changeset 2990:e67deeca9f3d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author peter1138 <peter1138@openttd.org>
date Mon, 06 Feb 2006 10:05:41 +0000
parents 00a81ec78145
children 4993a64be87e
files engine.c players.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/engine.c
+++ b/engine.c
@@ -428,7 +428,7 @@
 				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) {
--- a/players.c
+++ b/players.c
@@ -628,7 +628,7 @@
 		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);