SmatZ opened the ticket and wrote:

r11027

In current version, there are some problems with Rail <-> ElRail conversions.
Only depot tile can be converted, but then there may be a train outside the depot.
Then, there are problems when the rail is converted back to elrail (it has to be reversed so the cached_power is updated).

On non-depot rail, the message TrainInTheWay is shown.

Similiar behaviour can be seen in 0.5 branch, but there cached_power is updated without reversing the train.

This patch allows Rail <-> ElRail conversion for all tiles, even when a train is on. Its power is upgraded using faster method, with VehicleFromPos instead of FOR_ALL_VEHICLES.
Also, some parts were unified into CmdConvertRail().

known "problems"
- when downgraded to rail, el.train will slow down slowly when on a bringe/tunnel, because it stays on the same "tile". On normal track, it stops when it should enter new tile
- train doesn't restart, when it enters electrified tile

This can be changed if this patch gets accepted. I don't want to make big patches as smaller will be accepted more likely.

Attachments

• rail-convert.diff (9.29 KiB)

Reported version: trunk
Operating system: All

This issue was imported from FlySpray: https://bugs.openttd.org/task/1182