eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 02:09: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

12
Train.cpp
View File

@@ -5701,12 +5701,16 @@ bool TTrain::Update( double const Deltatime )
}
// Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys
if ((mvControlled->EngineType != TEngineType::DieselElectric)
&& (mvControlled->EngineType != TEngineType::ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens?
fHVoltage = std::max( mvControlled->PantographVoltage, mvControlled->GetTrainsetVoltage() ); // Winger czy to nie jest zle?
if( ( mvControlled->EngineType != TEngineType::DieselElectric )
&& ( mvControlled->EngineType != TEngineType::ElectricInductionMotor ) ) { // Ra 2014-09: czy taki rozdzia? ma sens?
fHVoltage = std::max(
mvControlled->PantographVoltage,
mvControlled->GetAnyTrainsetVoltage() ); // Winger czy to nie jest zle?
}
// *mvControlled->Mains);
else
else {
fHVoltage = mvControlled->EngineVoltage;
}
if (ShowNextCurrent)
{ // jeśli pokazywać drugi człon
if (mvSecond)