diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-14 17:05:42 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-14 17:05:42 +0300 |
| commit | 24875f34d0e0b21bc6ebd3ec2e184463d28d1522 (patch) | |
| tree | 821cf46dd7aabd6af830462a36fac0e3ed062c5c /src/control/Script.cpp | |
| parent | 41e9754338c3496a9caa8fc67f892cf043713293 (diff) | |
| parent | 2fb4305a73c2aa1972daf1037189b2bc5b25ea34 (diff) | |
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 50dc6b7b..3bcfa745 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -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: |