summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-02-06 10:05:41 +0000
committerpeter1138 <peter1138@openttd.org>2006-02-06 10:05:41 +0000
commit431b09ab796955d1c54a33fb7a481242c819afd2 (patch)
treec305341837438cfb1e1ac1d9cc54fcc6c50df341
parent453b30e387f8d8ab1839d96b0d1f9a8fea841292 (diff)
downloadopenttd-431b09ab796955d1c54a33fb7a481242c819afd2.tar.xz
(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.
-rw-r--r--engine.c2
-rw-r--r--players.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine.c b/engine.c
index 93704ae8f..b19efceba 100644
--- a/engine.c
+++ b/engine.c
@@ -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) {
diff --git a/players.c b/players.c
index 1348ebc20..5ce773ca4 100644
--- a/players.c
+++ b/players.c
@@ -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);