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

Poprawione błędy do kompilacji.

Browse Source
This commit is contained in:
firleju
2016-12-02 23:34:17 +01:00
parent 3ffb50ce12
commit b8f624b251
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
McZapkie/Mover.cpp
View File

@@ -1249,7 +1249,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap
{ {
HVCouplers[b][0] = HVCouplers[b][0] =
Couplers[b].Connected->HVCouplers[1 - Couplers[b].ConnectedNr][0] + Couplers[b].Connected->HVCouplers[1 - Couplers[b].ConnectedNr][0] +
Itot * HVCouplers[b][1] / hvc // obciążenie rozkladane stosownie do napiec Itot * HVCouplers[b][1] / hvc; // obciążenie rozkladane stosownie do napiec
} }
else // pierwszy pojazd else // pierwszy pojazd
{ {
@@ -3136,8 +3136,8 @@ void TMoverParameters::UpdatePipePressure(double dt)
{ {
if ((EngineType != ElectricInductionMotor)) if ((EngineType != ElectricInductionMotor))
dpLocalValve = dpLocalValve =
LocHandle->GetPF(Max0R(LocalBrakePos * 1.0 / LocalBrakePosNo, LocalBrakePosA), LocHandle->GetPF(Max0R(LocalBrakePos / LocalBrakePosNo, LocalBrakePosA),
Hamulec->GetBCP, ScndPipePress, dt, 0); Hamulec->GetBCP(), ScndPipePress, dt, 0);
else else
dpLocalValve = dpLocalValve =
LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0); LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0);
@@ -4227,7 +4227,7 @@ double TMoverParameters::TractionForce(double dt)
Ft = Ft * EnginePower / tmp; Ft = Ft * EnginePower / tmp;
} }
if ((Imax > 1) and (Im > Imax)) if ((Imax > 1) && (Im > Imax))
FuseOff(); FuseOff();
if (FuseFlag) if (FuseFlag)
Voltage = 0; Voltage = 0;
@@ -8127,7 +8127,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV
} }
else if (Command == "SandDoseOn") else if (Command == "SandDoseOn")
{ {
if (SandDoseOn) if (SandDoseOn())
OK = true; OK = true;
else else
OK = false; OK = false;
@@ -8233,16 +8233,14 @@ int TMoverParameters::ShowCurrentP(int AmpN)
else // podać całkowity else // podać całkowity
return floor(abs(Itot)); return floor(abs(Itot));
} }
else // pobor pradu jezeli niema mocy else // pobor pradu jezeli niema mocy
{ {
int current = 0; int current = 0;
for (b = 0; b < 1; b++) for (b = 0; b < 2; b++)
// with Couplers[b] do // with Couplers[b] do
if (TestFlag(Couplers[b].CouplingFlag, ctrain_controll)) if (TestFlag(Couplers[b].CouplingFlag, ctrain_controll))
if (Couplers[b].Connected->Power > 0.01) if (Couplers[b].Connected->Power > 0.01)
current = Couplers[b].Connected->ShowCurrent(AmpN); current = Couplers[b].Connected->ShowCurrent(AmpN);
return current; return current;
} }
} }