eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 06:49:19 +02:00
Code Issues 123 Wiki Activity

build 191115. vehicle voltage circuits logic fixes, ai train manager logic tweak

Browse Source
This commit is contained in:
tmj-fstate
2019-11-16 21:09:52 +01:00
parent ff0f14ab1a
commit 14ab3fd3d7
7 changed files with 133 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
DynObj.cpp
View File

@@ -2793,7 +2793,7 @@ bool TDynamicObject::Update(double dt, double dt1)
|| MoverParameters->PantRearUp ) {
if( ( MoverParameters->Mains )
&& ( MoverParameters->GetTrainsetVoltage() < 0.1f ) ) {
&& ( MoverParameters->GetAnyTrainsetVoltage() < 0.1f ) ) {
// Ra 15-01: logować tylko, jeśli WS załączony
// yB 16-03: i nie jest to asynchron zasilany z daleka
// Ra 15-01: bezwzględne współrzędne pantografu nie są dostępne,
@@ -6038,30 +6038,60 @@ int TDynamicObject::DirectionSet(int d)
};
// wskaźnik na poprzedni, nawet wirtualny
TDynamicObject * TDynamicObject::PrevAny() {
TDynamicObject * TDynamicObject::PrevAny() const {
return MoverParameters->Neighbours[ iDirection ^ 1 ].vehicle;
}
TDynamicObject * TDynamicObject::Prev() {
TDynamicObject * TDynamicObject::Prev() const {
return ( MoverParameters->Couplers[ iDirection ^ 1 ].CouplingFlag != coupling::faux ?
MoverParameters->Neighbours[ iDirection ^ 1 ].vehicle :
nullptr );// gdy sprzęg wirtualny, to jakby nic nie było
}
TDynamicObject * TDynamicObject::Next() {
TDynamicObject * TDynamicObject::Next() const {
return ( MoverParameters->Couplers[ iDirection ].CouplingFlag != coupling::faux ?
MoverParameters->Neighbours[ iDirection ].vehicle :
nullptr );// gdy sprzęg wirtualny, to jakby nic nie było
}
TDynamicObject * TDynamicObject::PrevC(int C) {
TDynamicObject * TDynamicObject::PrevC(int C) const {
return ( ( MoverParameters->Couplers[ iDirection ^ 1 ].CouplingFlag & C ) == C ?
MoverParameters->Neighbours[ iDirection ^ 1 ].vehicle :
nullptr ); // hide neighbour lacking specified connection type
}
TDynamicObject * TDynamicObject::NextC(int C) {
TDynamicObject * TDynamicObject::NextC(int C) const {
return ( ( MoverParameters->Couplers[ iDirection ].CouplingFlag & C ) == C ?
MoverParameters->Neighbours[ iDirection ].vehicle :
nullptr ); // hide neighbour lacking specified connection type
}
// checks whether there's unbroken connection of specified type to specified vehicle
bool
TDynamicObject::is_connected( TDynamicObject const *Vehicle, coupling const Coupling ) const {
auto *vehicle { this };
if( vehicle == Vehicle ) {
// edge case, vehicle is always "connected" with itself
return true;
}
// check ahead, it's more likely the "owner" using this method is located there
while( ( vehicle = vehicle->PrevC( Coupling ) ) != nullptr ) {
if( vehicle == Vehicle ) {
return true;
}
if( vehicle == this ) {
// edge case, looping consist
return false;
}
}
// start anew in the other direction
vehicle = this;
while( ( vehicle = vehicle->NextC( Coupling ) ) != nullptr ) {
if( vehicle == Vehicle ) {
return true;
}
}
// no lack in either direction, give up
return false;
}
// ustalenie następnego (1) albo poprzedniego (0) w składzie bez względu na prawidłowość iDirection
TDynamicObject *
TDynamicObject::Neighbour(int &dir) {