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

Poprawki po łączeniu wersji w wywołaniu funkcji DynObj::DestinationSet

Browse Source
This commit is contained in:
firleju
2016-09-13 06:46:13 +02:00
parent 4dcb496ec1
commit a16328acfa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Driver.cpp
View File

@@ -1874,7 +1874,8 @@ bool TController::CheckVehicles(TOrders user)
{ {
if (TrainParams) if (TrainParams)
if (p->asDestination == "none") if (p->asDestination == "none")
p->DestinationSet(TrainParams->Relation2, TrainParams->TrainName); // relacja docelowa, je<6A>li nie by<62>o p->DestinationSet(AnsiString(TrainParams->Relation2.c_str()),
AnsiString(TrainParams->TrainName.c_str())); // relacja docelowa, je<6A>li nie by<62>o
if (AIControllFlag) // je<6A>li prowadzi komputer if (AIControllFlag) // je<6A>li prowadzi komputer
p->RaLightsSet(0, 0); // gasimy <20>wiat<61>a p->RaLightsSet(0, 0); // gasimy <20>wiat<61>a
if (p->MoverParameters->EnginePowerSource.SourceType == CurrentCollector) if (p->MoverParameters->EnginePowerSource.SourceType == CurrentCollector)
@@ -2985,7 +2986,7 @@ bool TController::PutCommand(AnsiString NewCommand, double NewValue1, double New
TDynamicObject *p = pVehicles[0]; TDynamicObject *p = pVehicles[0];
while (p) while (p)
{ {
p->DestinationSet(NewCommand, TrainParams->TrainName); // relacja docelowa p->DestinationSet(NewCommand, AnsiString(TrainParams->TrainName.c_str())); // relacja docelowa
p = p->Next(); // pojazd pod<6F><64>czony od ty<74>u (licz<63>c od czo<7A>a) p = p->Next(); // pojazd pod<6F><64>czony od ty<74>u (licz<63>c od czo<7A>a)
} }
} }

2
mtable.cpp
View File

@@ -39,7 +39,7 @@ double CompareTime(double t1h, double t1m, double t2h, double t2m) /*roznica cza
double TTrainParameters::CheckTrainLatency() double TTrainParameters::CheckTrainLatency()
{ {
if ((LastStationLatency > 1.0) || (LastStationLatency < -1.0)) if ((LastStationLatency > 1.0) || (LastStationLatency < 0))
return LastStationLatency; /*spoznienie + lub do przodu - z tolerancja 1 min*/ return LastStationLatency; /*spoznienie + lub do przodu - z tolerancja 1 min*/
else else
return 0; return 0;