aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-20 13:27:16 +0200
committerFilippos Karapetis2014-12-20 18:06:26 +0200
commit0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979 (patch)
tree471f03e8b1e376ee91c7def0b7daaf11d3c633a5 /engines
parentb41b3e1a89d7646561697b1bc3636345230a9f12 (diff)
downloadscummvm-rg350-0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979.tar.gz
scummvm-rg350-0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979.tar.bz2
scummvm-rg350-0f590561bd0fe7238fcfd5fcee0d8a4dc11b9979.zip
ZVISION: Simplify check
Thanks to DrMcCoy for spotting this
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/sound/zork_raw.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 8688039325..b2c88b34df 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -73,10 +73,7 @@ RawChunkStream::RawChunk RawChunkStream::readNextChunk(Common::SeekableReadStrea
tmp.size = 0;
tmp.data = NULL;
- if (!stream)
- return tmp;
-
- if (stream && (stream->size() == 0 || stream->eos()))
+ if (!stream || stream->size() == 0 || stream->eos())
return tmp;
tmp.size = (stream->size() - stream->pos()) * 2;