(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.
authorpeter1138
Mon, 06 Feb 2006 10:05:41 +0000
changeset 2990 352b4590ee1c
parent 2989 99c95a3ebcaa
child 2991 4582583fba15
(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.
engine.c
players.c
--- a/engine.c	Mon Feb 06 09:18:04 2006 +0000
+++ b/engine.c	Mon Feb 06 10:05:41 2006 +0000
@@ -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	Mon Feb 06 09:18:04 2006 +0000
+++ b/players.c	Mon Feb 06 10:05:41 2006 +0000
@@ -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);