aboutsummaryrefslogtreecommitdiff
path: root/engines/adl/hires2.cpp
diff options
context:
space:
mode:
authorWalter van Niftrik2016-04-09 17:00:49 +0200
committerWalter van Niftrik2016-06-06 20:35:49 +0200
commit4f932afd60a25366188f07a68996c5fcb097ae38 (patch)
treed1dd23dcde5b4f51de08384c7269e14539c9fb01 /engines/adl/hires2.cpp
parent1842d0c45f3b37442dcf94466589e0a4960bdc08 (diff)
downloadscummvm-rg350-4f932afd60a25366188f07a68996c5fcb097ae38.tar.gz
scummvm-rg350-4f932afd60a25366188f07a68996c5fcb097ae38.tar.bz2
scummvm-rg350-4f932afd60a25366188f07a68996c5fcb097ae38.zip
ADL: Load messages on demand
Diffstat (limited to 'engines/adl/hires2.cpp')
-rw-r--r--engines/adl/hires2.cpp14
1 files changed, 3 insertions, 11 deletions
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));