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

build 170509. minor fixes for pantograph logic and speed table calculations

Browse Source
This commit is contained in:
tmj-fstate
2017-05-09 20:26:22 +02:00
parent 54fc93f6e5
commit 6655011af7
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DynObj.cpp
View File

@@ -2943,8 +2943,11 @@ bool TDynamicObject::Update(double dt, double dt1)
// drop pantographs
// NOTE: this isn't universal behaviour
// TODO: have this dependant on .fiz-driven flag
// NOTE: moved to pantspeed calculation part a little later in the function. all remarks and todo still apply
/*
MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) );
MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) );
*/
}
}
@@ -3226,6 +3229,10 @@ bool TDynamicObject::Update(double dt, double dt1)
else {
pantspeedfactor = 0.0;
}
if( ( false == MoverParameters->Battery )
&& ( false == MoverParameters->ConverterFlag ) ) {
pantspeedfactor = 0.0;
}
pantspeedfactor = std::max( 0.0, pantspeedfactor );
k = p->fAngleL;
if( ( pantspeedfactor > 0.0 )