diff options
| author | Torbjörn Andersson | 2013-08-18 09:05:03 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2013-08-18 09:05:03 +0200 |
| commit | b8c198aec9ab92f22b8ddce0bf0049501e14fb62 (patch) | |
| tree | a12daaab45449d97ed6931dd05d25323bf5f3305 /engines/scumm/script_v6.cpp | |
| parent | 598d1a9c9c461c175dc1f57614008766bdb58107 (diff) | |
| download | scummvm-rg350-b8c198aec9ab92f22b8ddce0bf0049501e14fb62.tar.gz scummvm-rg350-b8c198aec9ab92f22b8ddce0bf0049501e14fb62.tar.bz2 scummvm-rg350-b8c198aec9ab92f22b8ddce0bf0049501e14fb62.zip | |
SCUMM: Remove unnecessary NULL check, CID 1003628
Since ah->data is an array, it can't ever be NULL.
Diffstat (limited to 'engines/scumm/script_v6.cpp')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index a75e864e7a..6983c51f30 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -394,7 +394,7 @@ ScummEngine_v6::ArrayHeader *ScummEngine_v6::getArray(int array) { int ScummEngine_v6::readArray(int array, int idx, int base) { ArrayHeader *ah = getArray(array); - if (ah == NULL || ah->data == NULL) + if (!ah) error("readArray: invalid array %d (%d)", array, readVar(array)); // WORKAROUND bug #645711. This is clearly a script bug, as this script |