diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-02 22:07:25 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-02 22:07:25 +0100 |
| commit | e473123a6aa3769b7aeef54526561c2f1ab32cc1 (patch) | |
| tree | 83bad0fe952bfcbdda6d41fee30e1d725b884866 /src | |
| parent | embarassing (diff) | |
| download | re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar.gz re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar.bz2 re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar.lz re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar.xz re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.tar.zst re3-e473123a6aa3769b7aeef54526561c2f1ab32cc1.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/control/Script.cpp | 2 | ||||
| -rw-r--r-- | src/peds/PedAttractor.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 40fb1ded..6aa314f2 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -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); } |