diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-06-26 14:34:52 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-06-26 14:34:52 +0300 |
| commit | 636f67ca3ff8244b8bc7d072256cc664e7d043ac (patch) | |
| tree | 79f85f3950fa80f84fe9b8d0c908aad2b2d585be /src/control | |
| parent | 8a5afd0db2fa2616556ed953c5c464c6930d6f47 (diff) | |
| parent | d4ba7c387b2f471232d8cabc5f83b2801b4e85b3 (diff) | |
Merge remote-tracking branch 'upstream/lcs' into lcs
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Garages.cpp | 2 | ||||
| -rw-r--r-- | src/control/Script10.cpp | 2 | ||||
| -rw-r--r-- | src/control/Script3.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 0b65dde7..e7da2eff 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -2140,7 +2140,7 @@ void CStoredCar::StoreCar(CVehicle* pVehicle) m_nModelIndex = pVehicle->GetModelIndex(); m_fPosX = pVehicle->GetPosition().x; m_fPosY = pVehicle->GetPosition().y; - m_fPosY = pVehicle->GetPosition().z; + m_fPosZ = pVehicle->GetPosition().z; m_fForwardX = pVehicle->GetForward().x; m_fForwardY = pVehicle->GetForward().y; m_fForwardZ = pVehicle->GetForward().z; diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index c619a9dd..ce822505 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -278,7 +278,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) CollectParameters(&m_nIp, 3); CPed* pPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(0)); if (pPed) - pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? (void*)GET_INTEGER_PARAM(2) : nil, true); + pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? &GET_INTEGER_PARAM(2) : nil, true); return 0; } case COMMAND_REGISTER_BEST_TIME_GOGO_FAGGIO: diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp index 64014ac8..b0f529c0 100644 --- a/src/control/Script3.cpp +++ b/src/control/Script3.cpp @@ -450,7 +450,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command) CollectParameters(&m_nIp, 2); CAutomobile* pCar = (CAutomobile*)CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0)); script_assert(pCar); - script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR); + //script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR); UpdateCompareFlag(pCar->m_bombType == GET_INTEGER_PARAM(1)); return 0; } |