a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-08 14:54:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' of github.com:GTAmodding/re3 into miami

Browse source
This commit is contained in:
aap 2020-11-03 20:33:14 +01:00
parent 3c5bb4e8f3 e473123a6a
commit 6857e26411
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/control/Script.cpp
View file

@ -12125,14 +12125,14 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
{ {
int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL); int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
UpdateCompareFlag(*ptr = ScriptParams[0]); UpdateCompareFlag(*ptr == ScriptParams[0]);
return 0; return 0;
} }
case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT: case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
{ {
int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL); int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
UpdateCompareFlag(*ptr = ScriptParams[0]); UpdateCompareFlag(*ptr == ScriptParams[0]);
return 0; return 0;
} }
case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS: 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: case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
{ {
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL); int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
UpdateCompareFlag(ScriptParams[0] >= *ptr); UpdateCompareFlag(ScriptParams[0] >= *ptr);
return 0; return 0;
} }

4
src/peds/PedAttractor.cpp
View file

@ -136,7 +136,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
return; return;
for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) { for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) {
if (assoc->GetVehicle() != pVehicle) { if (assoc->GetVehicle() != pVehicle) {
assoc++; ++assoc;
continue; continue;
} }
uint32 total = 0; uint32 total = 0;
@ -145,7 +145,7 @@ void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
total++; total++;
} }
if (total > 0) if (total > 0)
assoc++; ++assoc;
else else
assoc = vVehicleToEffect.erase(assoc); assoc = vVehicleToEffect.erase(assoc);
} }