- Moved all of the parser-related variables inside the Vocabulary class

- Moved the kSetSynonyms() function inside kscripts (as it's for script synonyms, not parser word synonyms)
- The parser vocabulary is now only initialized for SCI0 and SCI01 games, which had a parser

svn-id: r47483

1 files changed, 6 insertions, 0 deletions

diff --git a/engines/sci/parser/vocabulary.h b/engines/sci/parser/vocabulary.h
index 00b8780d1c..d624ccc3fb 100644
--- a/engines/sci/parser/vocabulary.h
+++ b/engines/sci/parser/vocabulary.h
@@ -32,6 +32,7 @@
 #include "common/list.h"
 
 #include "sci/sci.h"
+#include "sci/engine/vm_types.h"
 
 namespace Sci {
 
@@ -313,6 +314,11 @@ private:
 public:
 	// Accessed by said()
 	parse_tree_node_t _parserNodes[VOCAB_TREE_NODES]; /**< The parse tree */
+
+	// Parser data:
+	reg_t parser_base; /**< Base address for the parser error reporting mechanism */
+	reg_t parser_event; /**< The event passed to Parse() and later used by Said() */
+	bool parserIsValid; /**< If something has been correctly parsed */
 };
 
 /**