From 5af8ed228d729dd9ef71f5f6cea7adb254dff7a4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Sep 2017 18:16:03 -0400
Subject: TITANIC: Add VocabMode enum, fix German vocab loading

---
 engines/titanic/support/exe_resources.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'engines/titanic/support/exe_resources.h')

diff --git a/engines/titanic/support/exe_resources.h b/engines/titanic/support/exe_resources.h
index 993c34db97..382df39984 100644
--- a/engines/titanic/support/exe_resources.h
+++ b/engines/titanic/support/exe_resources.h
@@ -29,6 +29,8 @@ class CScriptHandler;
 
 enum FileHandle { HANDLE_STDIN = 0, HANDLE_STDOUT = 1, HANDLE_STDERR = 2 };
 
+enum VocabMode { VOCAB_MODE_NONE = 0, VOCAB_MODE_EN = 3, VOCAB_MODE_DE = 5 };
+
 class CExeResources {
 public:
 	CScriptHandler *_owner;
@@ -37,14 +39,21 @@ public:
 	int _fieldC;
 	int _field10;
 	int _field14;
-	int _field18;
+	VocabMode _vocabMode;
 public:
 	CExeResources();
 
-	void reset(CScriptHandler *owner, int val1, int val2);
+	void reset(CScriptHandler *owner, int val1, VocabMode vocabMode);
+
+	/**
+	 * Tests whether the vocab mode equals the passed mode
+	 */
+	bool isVocabMode(int mode) const { return _vocabMode == mode; }
 
-	bool is18Equals(int val) const { return _field18 == val; }
-	int get18() const { return _field18; }
+	/**
+	 * Returns the vocab mode
+	 */
+	VocabMode getVocabMode() const { return _vocabMode; }
 };
 
 } // End of namespace Titanic
-- 
cgit v1.2.3