18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 01:46:01 +01:00

Merge pull request #279 from MaSzyna-EU07/fix/multiple-unit-electric-diesel

No multiple-unit control between electric and diesel locomotives (eu07/maszyna#520)
This commit is contained in:
2026-11-09 12:53:30 +00:00
committed by GitHub
7 changed files with 222 additions and 5 deletions

View File

@@ -7047,8 +7047,14 @@ TController::UpdateConnect() {
auto *vehicle { iCouplingVehicle.value().first };
auto const couplingend { iCouplingVehicle.value().second };
auto *vehicleparameters { vehicle->MoverParameters };
if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != iCoupler ) {
auto const &neighbour { vehicleparameters->Neighbours[ couplingend ] };
auto const &neighbour { vehicleparameters->Neighbours[ couplingend ] };
// vehicles which can't share their control get coupled without the control connection (eu07/maszyna#520)
auto expectedcoupling { iCoupler };
if( neighbour.vehicle != nullptr ) {
auto const neighbourend { neighbour.vehicle_end != 2 ? neighbour.vehicle_end : vehicleparameters->Couplers[ couplingend ].ConnectedNr };
expectedcoupling = vehicleparameters->CompatibleCoupling( couplingend, *neighbour.vehicle->MoverParameters, neighbourend, iCoupler );
}
if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != expectedcoupling ) {
if( neighbour.vehicle != nullptr && neighbour.distance < 10 ) {
// check whether we need to attach coupler adapter
auto coupleriscompatible{true};
@@ -7070,7 +7076,7 @@ TController::UpdateConnect() {
}
}
// NOTE: no else as the preceeding block can potentially establish expected connection
if( vehicleparameters->Couplers[ couplingend ].CouplingFlag == iCoupler ) {
if( vehicleparameters->Couplers[ couplingend ].CouplingFlag == expectedcoupling ) {
// jeżeli został podłączony
CheckVehicles( Connect ); // sprawdzić światła nowego składu