summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-11-09 16:17:54 +0100
committereray orçunus <erayorcunus@gmail.com>2019-11-12 23:16:23 +0100
commit030f64daf106d75c4dc058d3799483a2e79c5e6b (patch)
treedb6355ac25253a21eb18435f2fae612045903f9a /src/control
parentMerge pull request #263 from Sergeanur/strcmp (diff)
downloadre3-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.cpp10
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);