thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Remove unnecessary NULL check, CID 1003628

Browse source 
Since ah->data is an array, it can't ever be NULL.
This commit is contained in:
Torbjörn Andersson 2013-08-18 09:05:03 +02:00
parent 598d1a9c9c
commit b8c198aec9
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/scumm/script_v6.cpp
View file

@ -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