From ebb6ceb2945084e73d1511a02d2ad8fe72d568e0 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Thu, 10 Mar 2016 16:55:40 +0100
Subject: ADL: Load verbs and nouns for hires2

---
 engines/adl/hires2.cpp | 10 ++++++++++
 engines/adl/hires2.h   |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index f318ad3845..1831266aec 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -51,6 +51,16 @@ void HiRes2Engine::runIntro() const {
 }
 
 void HiRes2Engine::loadData() {
+	Common::File f;
+
+	if (!f.open(IDS_HR2_DISK_IMAGE))
+		error("Failed to open file '" IDS_HR2_DISK_IMAGE "'");
+
+	f.seek(IDI_HR2_OFS_VERBS);
+	loadWords(f, _verbs);
+
+	f.seek(IDI_HR2_OFS_NOUNS);
+	loadWords(f, _nouns);
 }
 
 void HiRes2Engine::initState() {
diff --git a/engines/adl/hires2.h b/engines/adl/hires2.h
index 9bb7b98aab..60c6ca12d8 100644
--- a/engines/adl/hires2.h
+++ b/engines/adl/hires2.h
@@ -37,9 +37,13 @@ namespace Adl {
 #define IDS_HR2_DISK_IMAGE "WIZARD.DSK"
 
 // Track, sector, offset
-#define TSO(T, S, O) (((T) * 16 + (S)) * 256 + (O))
+#define TSO(TRACK, SECTOR, OFFSET) (((TRACK) * 16 + (SECTOR)) * 256 + (OFFSET))
+#define TS(TRACK, SECTOR) TSO(TRACK, SECTOR, 0)
+#define T(TRACK) TS(TRACK, 0)
 
 #define IDI_HR2_OFS_INTRO_TEXT TSO(0x00, 0xd, 0x17)
+#define IDI_HR2_OFS_VERBS        T(0x19)
+#define IDI_HR2_OFS_NOUNS       TS(0x22, 0x2)
 
 class HiRes2Engine : public AdlEngine {
 public:
-- 
cgit v1.2.3