diff options
| author | Strangerke | 2016-04-17 11:03:05 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-10 09:54:21 +0200 |
| commit | be10dd378cea478c958d68aea2bda9232ae4ce75 (patch) | |
| tree | 1bd6da35331eaad64b8d904c26afe65d43a631da /engines | |
| parent | ba20d63573a7db596a4c7532e99508621fafad84 (diff) | |
| download | scummvm-rg350-be10dd378cea478c958d68aea2bda9232ae4ce75.tar.gz scummvm-rg350-be10dd378cea478c958d68aea2bda9232ae4ce75.tar.bz2 scummvm-rg350-be10dd378cea478c958d68aea2bda9232ae4ce75.zip | |
GNAP: Remove useless return after an error
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gnap/resource.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/gnap/resource.h b/engines/gnap/resource.h index 73cee761c6..7235351f65 100644 --- a/engines/gnap/resource.h +++ b/engines/gnap/resource.h @@ -171,10 +171,9 @@ protected: } ResourceClass *load(int resourceId) { - if (_dat->getResourceType(resourceId) != ResourceType) { + if (_dat->getResourceType(resourceId) != ResourceType) error("ResourceCache::load() Wrong resource type: Expected %d, got %d", ResourceType, _dat->getResourceType(resourceId)); - return nullptr; - } + byte *resourceData = _dat->loadResource(resourceId); uint32 resourceSize = _dat->getResourceSize(resourceId); ResourceClass *obj = new ResourceClass(resourceId, resourceData, resourceSize); |