mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-05 04:44:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
This commit is contained in:
Sergeanur 2020-05-14 17:05:42 +03:00
commit 24875f34d0
18 changed files with 211 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/control/Script.cpp
View file

@ -5661,8 +5661,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
{
CollectParameters(&m_nIp, 1);
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
assert(pVehicle);
UpdateCompareFlag(pVehicle->bIsInWater);
UpdateCompareFlag(pVehicle && pVehicle->bIsInWater);
return 0;
}
case COMMAND_GET_CLOSEST_CHAR_NODE: