diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-11-09 16:17:54 +0100 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-11-12 23:16:23 +0100 |
| commit | 030f64daf106d75c4dc058d3799483a2e79c5e6b (patch) | |
| tree | db6355ac25253a21eb18435f2fae612045903f9a /src/control | |
| parent | Merge pull request #263 from Sergeanur/strcmp (diff) | |
| download | re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar.gz re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar.bz2 re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar.lz re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar.xz re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.tar.zst re3-030f64daf106d75c4dc058d3799483a2e79c5e6b.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 0b5f1105..62f92620 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -200,7 +200,7 @@ void CUpsideDownCarCheck::Init() { for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){ m_sCars[i].m_nVehicleIndex = -1; - m_sCars[i].m_nVehicleIndex = 0; + m_sCars[i].m_nUpsideDownTimer = 0; } } @@ -216,6 +216,10 @@ void CUpsideDownCarCheck::UpdateTimers() { uint32 timeStep = CTimer::GetTimeStepInMilliseconds(); for (int i = 0; i < MAX_UPSIDEDOWN_CAR_CHECKS; i++){ +#ifdef FIX_BUGS + if (m_sCars[i].m_nVehicleIndex == -1) + continue; +#endif CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sCars[i].m_nVehicleIndex); if (v){ if (IsCarUpsideDown(m_sCars[i].m_nVehicleIndex)) @@ -3424,7 +3428,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command) assert(pPed); // Useless call. CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp)); - int handle = CRadar::SetEntityBlip(BLIP_CHAR, ScriptParams[0], 0, BLIP_DISPLAY_BOTH); + int handle = CRadar::SetEntityBlip(BLIP_CHAR, ScriptParams[0], 1, BLIP_DISPLAY_BOTH); CRadar::ChangeBlipScale(handle, 3); ScriptParams[0] = handle; StoreParameters(&m_nIp, 1); @@ -3437,7 +3441,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command) assert(pObject); // Useless call. CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp)); - int handle = CRadar::SetEntityBlip(BLIP_OBJECT, ScriptParams[0], 0, BLIP_DISPLAY_BOTH); + int handle = CRadar::SetEntityBlip(BLIP_OBJECT, ScriptParams[0], 6, BLIP_DISPLAY_BOTH); CRadar::ChangeBlipScale(handle, 3); ScriptParams[0] = handle; StoreParameters(&m_nIp, 1); |