build 170531. fix for pantograph pressure switch activation, partial fix for event sorting

This commit is contained in:
tmj-fstate
2017-06-01 16:21:17 +02:00
parent d2a9f7080e
commit a28b3d5af9
6 changed files with 113 additions and 54 deletions

View File

@@ -612,8 +612,10 @@ void TEvent::Load(cParser *parser, vector3 *org)
void TEvent::AddToQuery(TEvent *e)
{ // dodanie eventu do kolejki
if (evNext ? (e->fStartTime >= evNext->fStartTime) : false)
evNext->AddToQuery(e); // sortowanie wg czasu
if( ( evNext != nullptr )
&& ( e->fStartTime > evNext->fStartTime ) ) {
evNext->AddToQuery( e ); // sortowanie wg czasu
}
else
{ // dodanie z przodu
e->evNext = evNext;