diff options
| author | Torbjörn Andersson | 2013-08-18 09:02:14 +0200 | 
|---|---|---|
| committer | Torbjörn Andersson | 2013-08-18 09:02:14 +0200 | 
| commit | 598d1a9c9c461c175dc1f57614008766bdb58107 (patch) | |
| tree | a780e9271b6f27e826791bcfffbd5cc8f8690c6a | |
| parent | 3c6aaaa1fb51698f1663237e7732e3efcf2b0931 (diff) | |
| download | scummvm-rg350-598d1a9c9c461c175dc1f57614008766bdb58107.tar.gz scummvm-rg350-598d1a9c9c461c175dc1f57614008766bdb58107.tar.bz2 scummvm-rg350-598d1a9c9c461c175dc1f57614008766bdb58107.zip  | |
SCUMM: Remove unnecessary NULL check, CID 1003627
Since ah->data is an array, it can't ever be NULL.
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index d4920cf430..42bf9a4bb6 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -158,7 +158,7 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {  	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array)); -	if (ah == NULL || ah->data == NULL) +	if (!ah)  		error("readArray: invalid array %d (%d)", array, readVar(array));  	if (idx2 < (int)FROM_LE_32(ah->dim2start) || idx2 > (int)FROM_LE_32(ah->dim2end) ||  | 
