From b8c198aec9ab92f22b8ddce0bf0049501e14fb62 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Sun, 18 Aug 2013 09:05:03 +0200 Subject: SCUMM: Remove unnecessary NULL check, CID 1003628 Since ah->data is an array, it can't ever be NULL. --- engines/scumm/script_v6.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm') 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 -- cgit v1.2.3