diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:28:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 22:28:09 +0200 |
| commit | 5cb7e2e42a17104a80053f1219ebbb022ff1dea1 (patch) | |
| tree | c59643f93c566c0813551f0b59596d44573c7c5b /src/control | |
| parent | Merge pull request #429 from Nick007J/master (diff) | |
| parent | fixed crash (diff) | |
| download | re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.gz re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.bz2 re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.lz re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.xz re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.tar.zst re3-5cb7e2e42a17104a80053f1219ebbb022ff1dea1.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/AutoPilot.cpp | 2 | ||||
| -rw-r--r-- | src/control/CarCtrl.cpp | 2 | ||||
| -rw-r--r-- | src/control/Garages.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp index b5bca21d..65e73e5d 100644 --- a/src/control/AutoPilot.cpp +++ b/src/control/AutoPilot.cpp @@ -35,7 +35,7 @@ void CAutoPilot::ModifySpeed(float speed) m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() - (uint32)(positionBetweenNodes * m_nTimeToSpendOnCurrentCurve); #else - m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() - positionBetweenNodes * m_nSpeedScaleFactor; + m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() - positionBetweenNodes * m_nTimeToSpendOnCurrentCurve; #endif } diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 264f1f3f..197fca63 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -426,7 +426,7 @@ CCarCtrl::GenerateOneRandomCar() (uint32)((0.5f + positionBetweenNodes) * pCar->AutoPilot.m_nTimeToSpendOnCurrentCurve); #else pCar->AutoPilot.m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() - - (0.5f + positionBetweenNodes) * pCar->AutoPilot.m_nSpeedScaleFactor; + (0.5f + positionBetweenNodes) * pCar->AutoPilot.m_nTimeToSpendOnCurrentCurve; #endif CVector directionCurrentLink(directionCurrentLinkX, directionCurrentLinkY, 0.0f); CVector directionNextLink(directionNextLinkX, directionNextLinkY, 0.0f); diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 9bd9a577..d187f666 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -1082,7 +1082,7 @@ void CGarage::Update() #ifdef FIX_BUGS bool bCreatedAllCars = false; #else - bool bCraetedAllCars; + bool bCreatedAllCars; #endif switch (m_eGarageType) { case GARAGE_HIDEOUT_ONE: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse1); break; |