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

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-01-01 19:02:57 +01:00
parent 1928e73ea2 04398e9fcf
commit 4d2d777737
6 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Driver.cpp
View File

@@ -3508,7 +3508,7 @@ TController::UpdateSituation(double dt) {
// if (mvOccupied->BrakePress<0.08) //to wystarczy, że zadziałają liniowe (nie ma ich jeszcze!!!)
if (fReady < 0.8) // delikatniejszy warunek, obejmuje wszystkie wagony
Ready = true; //żeby uznać za odhamowany
// second pass, for diesel engines verify the engines are fully started
// second pass, for diesel engines verify the (live) engines are fully started
// TODO: cache presence of diesel engines in the consist, to skip this test if there isn't any
p = pVehicles[ 0 ]; // pojazd na czole składu
while( ( true == Ready )
@@ -3520,7 +3520,8 @@ TController::UpdateSituation(double dt) {
|| ( vehicle->EngineType == DieselElectric ) ) {
Ready = (
( vehicle->Vel > 0.5 )
( vehicle->Vel > 0.5 ) // already moving
|| ( false == vehicle->Mains ) // deadweight vehicle
|| ( vehicle->enrot > 0.8 * (
vehicle->EngineType == DieselEngine ?
vehicle->dizel_nmin :