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

energy meter tweaks

Browse Source
This commit is contained in:
milek7
2021-01-16 22:33:14 +01:00
parent 5d130c7fcf
commit d096c52b5b
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DynObj.cpp
View File

@@ -3680,7 +3680,8 @@ bool TDynamicObject::Update(double dt, double dt1)
else
MoverParameters->PantFrontVolt = 0.0;
MoverParameters->EnergyConsumed += MoverParameters->PantFrontVolt * fPantCurrent * dt1 / 3600000.0;
((fPantCurrent > 0.0) ? MoverParameters->EnergyMeter.first : MoverParameters->EnergyMeter.second) += MoverParameters->PantFrontVolt * fPantCurrent * dt1 / 3600000.0;
break;
case 1:
if( ( false == Global.bLiveTraction )
@@ -3726,7 +3727,8 @@ bool TDynamicObject::Update(double dt, double dt1)
MoverParameters->PantRearVolt = 0.0;
}
MoverParameters->EnergyConsumed += MoverParameters->PantRearVolt * fPantCurrent * dt1 / 3600000.0;
((fPantCurrent > 0.0) ? MoverParameters->EnergyMeter.first : MoverParameters->EnergyMeter.second) += MoverParameters->PantRearVolt * fPantCurrent * dt1 / 3600000.0;
break;
} // pozostałe na razie nie obsługiwane
if( MoverParameters->PantPress > (