diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-31 21:34:19 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-31 21:34:19 +0100 |
| commit | 48926fcadeaf4a7ea0c893988955dd1e850e3db8 (patch) | |
| tree | 881210b3d12be7015ae3be6f04958671de6355b5 /src/control/Script7.cpp | |
| parent | Merge branch 'lcs-dev' into lcs (diff) | |
| download | re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar.gz re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar.bz2 re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar.lz re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar.xz re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.tar.zst re3-48926fcadeaf4a7ea0c893988955dd1e850e3db8.zip | |
Diffstat (limited to 'src/control/Script7.cpp')
| -rw-r--r-- | src/control/Script7.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp index c50f0dea..6dd6e281 100644 --- a/src/control/Script7.cpp +++ b/src/control/Script7.cpp @@ -438,8 +438,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) { CollectParameters(&m_nIp, 1); CObject* pObject = CPools::GetObjectPool()->GetAt(GET_INTEGER_PARAM(0)); - script_assert(pObject); - UpdateCompareFlag(pObject->bIsInWater); + UpdateCompareFlag(pObject && pObject->bIsInWater); return 0; } //case COMMAND_SET_CHAR_OBJ_STEAL_ANY_CAR_EVEN_MISSION_CAR: |