Feature: Allow converting track under trains when compatible with the new rail type #8505
Conversation
LordAro
force-pushed
the
allow-railtype-convert
branch
from
f2e0c3a
to
2d890c6
Compare
|
This allows converting elrail to rail, while an elrail train is on the tile. How do road/tramtypes behave? |
LordAro
force-pushed
the
allow-railtype-convert
branch
from
2d890c6
to
25f992b
Compare
|
|
||
| Train *t = Train::From(v); | ||
| if (HasBit(t->First()->compatible_railtypes, procdata->type) && HasPowerOnRail(t->First()->railtype, procdata->type)) return nullptr; | ||
| if (rail_bits & TRACK_BIT_WORMHOLE) { |
There was a problem hiding this comment.
The TRACK_BIT_WORMHOLE masking/etc is specific to the custom bridge heads implementation in my branch, so you can probably simplify this section a bit.
|
|
||
| if (v->z_pos > procdata->z) return nullptr; | ||
| Train *t = Train::From(v)->First(); | ||
| if (HasBit(t->compatible_railtypes, procdata->type) && HasPowerOnRail(t->railtype, procdata->type)) return nullptr; |
There was a problem hiding this comment.
HasPowerOnRail(t->railtype, procdata->type) is not correct as this only tests the rail type of the first engine.
It's perfectly legal to create mixed power consists of compatible but not necessarily mutually powered rail types.
See the calculation of Train::compatible_railtypes in Train::ConsistChanged.
For testing you also need to note the current value of VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL
There was a problem hiding this comment.
Yes, I did wonder. Not as simple as I thought! I'll get there... probably.
TrueBrain
force-pushed
the
allow-railtype-convert
branch
from
25f992b
to
e184ffc
Compare
2TallTyler
added
the
work: needs more work
|
Any chance of you continuing this patch? It sounds like a lovely idea :) |
|
This already seems possible so I don't know if this is just outdated, or does something different than the existing behaviour? |
Motivation / Problem
Probably fixes #8314
Cherry-picked from JGRennison/OpenTTD-patches@a18ebba with some modifications due to no per-vehicle-type
HasVehicleOnPosfunctionAt the request of @markspolakovs ;)
Description
Allows converting track under trains when compatible with the new rail type
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.