equal
deleted
inserted
replaced
2010 |
2010 |
2011 // No smoke in depots or tunnels |
2011 // No smoke in depots or tunnels |
2012 if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue; |
2012 if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue; |
2013 |
2013 |
2014 // No sparks for electric vehicles on nonelectrified tracks |
2014 // No sparks for electric vehicles on nonelectrified tracks |
2015 if (!HasPowerOnRail(v->u.rail.railtype, GetTileRailType(v->tile, TrackdirToTrack(GetVehicleTrackdir(v))))) continue; |
2015 if (!HasPowerOnRail(v->u.rail.railtype, GetTileRailType(v->tile))) continue; |
2016 |
2016 |
2017 if (effect_type == 0) { |
2017 if (effect_type == 0) { |
2018 // Use default effect type for engine class. |
2018 // Use default effect type for engine class. |
2019 effect_type = rvi->engclass; |
2019 effect_type = rvi->engclass; |
2020 } else { |
2020 } else { |
3017 if (IsFrontEngine(v)) v->load_unload_time_rem = 0; |
3017 if (IsFrontEngine(v)) v->load_unload_time_rem = 0; |
3018 |
3018 |
3019 if (!HASBIT(r, VETS_ENTERED_WORMHOLE)) { |
3019 if (!HASBIT(r, VETS_ENTERED_WORMHOLE)) { |
3020 v->tile = gp.new_tile; |
3020 v->tile = gp.new_tile; |
3021 |
3021 |
3022 if (GetTileRailType(gp.new_tile, FindFirstTrack(chosen_track)) != GetTileRailType(gp.old_tile, FindFirstTrack(v->u.rail.track))) { |
3022 if (GetTileRailType(gp.new_tile) != GetTileRailType(gp.old_tile)) { |
3023 TrainPowerChanged(GetFirstVehicleInChain(v)); |
3023 TrainPowerChanged(GetFirstVehicleInChain(v)); |
3024 } |
3024 } |
3025 |
3025 |
3026 v->u.rail.track = chosen_track; |
3026 v->u.rail.track = chosen_track; |
3027 assert(v->u.rail.track); |
3027 assert(v->u.rail.track); |