mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-25 01:01:49 +01:00
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
This commit is contained in:
commit
6857e26411
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user