diff options
author | peter1138 <peter1138@openttd.org> | 2006-02-06 10:05:41 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2006-02-06 10:05:41 +0000 |
commit | 431b09ab796955d1c54a33fb7a481242c819afd2 (patch) | |
tree | c305341837438cfb1e1ac1d9cc54fcc6c50df341 | |
parent | 453b30e387f8d8ab1839d96b0d1f9a8fea841292 (diff) | |
download | openttd-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.c | 2 | ||||
-rw-r--r-- | players.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) { @@ -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); |