From 4f932afd60a25366188f07a68996c5fcb097ae38 Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Sat, 9 Apr 2016 17:00:49 +0200 Subject: ADL: Load messages on demand --- engines/adl/hires2.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'engines/adl/hires2.cpp') diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp index a0fa5a0ff8..06fdc5ff9a 100644 --- a/engines/adl/hires2.cpp +++ b/engines/adl/hires2.cpp @@ -54,18 +54,10 @@ void HiRes2Engine::init() { if (!_disk->open(IDS_HR2_DISK_IMAGE)) error("Failed to open disk image '" IDS_HR2_DISK_IMAGE "'"); - StreamPtr stream(_disk->createReadStream(0x1f, 0x2, 0x04, 4)); + StreamPtr stream(_disk->createReadStream(0x1f, 0x2, 0x00, 4)); - for (uint i = 0; i < IDI_HR2_NUM_MESSAGES; ++i) { - DataBlockPtr str(readDataBlockPtr(*stream)); - - if (str) { - StreamPtr strStream(str->createReadStream()); - _messages.push_back(readString(*strStream, 0xff)); - } else { - _messages.push_back(Common::String()); - } - } + for (uint i = 0; i < IDI_HR2_NUM_MESSAGES; ++i) + _messages.push_back(readDataBlockPtr(*stream)); // Read parser messages stream.reset(_disk->createReadStream(0x1a, 0x1)); -- cgit v1.2.3