diff options
| author | Strangerke | 2018-08-31 00:23:06 +0200 |
|---|---|---|
| committer | Strangerke | 2018-08-31 00:24:00 +0200 |
| commit | a6e874415998cdff52ffefac9a20841d61764004 (patch) | |
| tree | 7086e4c9abf13edeb8ecccf4c8ba47e0bb8bb821 | |
| parent | ae512d3bb3130bad8305400b0e526178e1f3b218 (diff) | |
| download | scummvm-rg350-a6e874415998cdff52ffefac9a20841d61764004.tar.gz scummvm-rg350-a6e874415998cdff52ffefac9a20841d61764004.tar.bz2 scummvm-rg350-a6e874415998cdff52ffefac9a20841d61764004.zip | |
STARTREK: remove dead code, simplify if statement by moving out code identical in both branches
| -rw-r--r-- | engines/startrek/startrek.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp index cbbadc2a5c..0a3a89a2bf 100644 --- a/engines/startrek/startrek.cpp +++ b/engines/startrek/startrek.cpp @@ -520,15 +520,10 @@ SharedPtr<FileStream> StarTrekEngine::loadFile(Common::String filename, int file error("Could not open data.run"); } + Common::SeekableReadStream *stream; if (getFeatures() & GF_DEMO && getPlatform() == Common::kPlatformDOS) { assert(fileCount == 1); // Sanity check... - Common::SeekableReadStream *stream = dataFile->readStream(uncompressedSize); - delete dataFile; - delete dataRunFile; - - byte *data = (byte *)malloc(stream->size()); - stream->read(data, stream->size()); - return SharedPtr<FileStream>(new FileStream(data, stream->size(), bigEndian)); + stream = dataFile->readStream(uncompressedSize); } else { if (fileCount != 1) { dataRunFile->seek(indexOffset); @@ -546,20 +541,14 @@ SharedPtr<FileStream> StarTrekEngine::loadFile(Common::String filename, int file uncompressedSize = (getPlatform() == Common::kPlatformAmiga) ? dataFile->readUint16BE() : dataFile->readUint16LE(); uint16 compressedSize = (getPlatform() == Common::kPlatformAmiga) ? dataFile->readUint16BE() : dataFile->readUint16LE(); - Common::SeekableReadStream *stream = decodeLZSS(dataFile->readStream(compressedSize), uncompressedSize); - - delete dataFile; - delete dataRunFile; - - byte *data = (byte *)malloc(stream->size()); - stream->read(data, stream->size()); - return SharedPtr<FileStream>(new FileStream(data, stream->size(), bigEndian)); + stream = decodeLZSS(dataFile->readStream(compressedSize), uncompressedSize); } - // We should not get to this point... - error("Could not find data for \'%s\'", filename.c_str()); - - return SharedPtr<FileStream>(); + delete dataFile; + delete dataRunFile; + byte *data = (byte *)malloc(stream->size()); + stream->read(data, stream->size()); + return SharedPtr<FileStream>(new FileStream(data, stream->size(), bigEndian)); } SharedPtr<FileStream> StarTrekEngine::loadFileWithParams(Common::String filename, bool unk1, bool unk2, bool unk3) { |