summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-03 20:33:14 +0100
committeraap <aap@papnet.eu>2020-11-03 20:33:14 +0100
commit6857e2641136e040ae141edea2482f7f5a3e0405 (patch)
tree4c1693b2f054897db7a3dcb3a7bc1b0e937b789a /src
parentnew LCS-style renderer (diff)
parentfixes (diff)
downloadre3-6857e2641136e040ae141edea2482f7f5a3e0405.tar
re3-6857e2641136e040ae141edea2482f7f5a3e0405.tar.gz
re3-6857e2641136e040ae141edea2482f7f5a3e0405.tar.bz2
re3-6857e2641136e040ae141edea2482f7f5a3e0405.tar.lz
re3-6857e2641136e040ae141edea2482f7f5a3e0405.tar.xz
re3-6857e2641136e040ae141edea2482f7f5a3e0405.tar.zst
re3-6857e2641136e040ae141edea2482f7f5a3e0405.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Script.cpp6
-rw-r--r--src/peds/PedAttractor.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index f9935e21..6aa314f2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -12125,14 +12125,14 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
{
int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
CollectParameters(&m_nIp, 1);
- UpdateCompareFlag(*ptr = ScriptParams[0]);
+ UpdateCompareFlag(*ptr == ScriptParams[0]);
return 0;
}
case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
{
int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
CollectParameters(&m_nIp, 1);
- UpdateCompareFlag(*ptr = ScriptParams[0]);
+ UpdateCompareFlag(*ptr == ScriptParams[0]);
return 0;
}
case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS:
@@ -12280,7 +12280,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
{
CollectParameters(&m_nIp, 1);
- int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+ int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
UpdateCompareFlag(ScriptParams[0] >= *ptr);
return 0;
}
diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp
index 45bed947..05e72ed3 100644
--- a/src/peds/PedAttractor.cpp
+++ b/src/peds/PedAttractor.cpp
@@ -136,7 +136,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
return;
for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) {
if (assoc->GetVehicle() != pVehicle) {
- assoc++;
+ ++assoc;
continue;
}
uint32 total = 0;
@@ -145,7 +145,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
total++;
}
if (total > 0)
- assoc++;
+ ++assoc;
else
assoc = vVehicleToEffect.erase(assoc);
}