From 4e55d7ba9476cd47a3118ecdeb0d0618e6d32211 Mon Sep 17 00:00:00 2001
From: richiesams
Date: Thu, 11 Jul 2013 00:08:00 -0500
Subject: ZVISION: Clean up includes

---
 engines/zvision/puzzle.h              | 8 ++++----
 engines/zvision/scr_file_handling.cpp | 4 ++--
 engines/zvision/zvision.h             | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index 9dab606f54..7a2755fd69 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -25,10 +25,10 @@
 
 #include "common/list.h"
 
-#include "zvision/actions.h"
-
 namespace ZVision {
 
+class ResultAction;
+
 /** How criteria should be decided */
 enum CriteriaOperator {
 	EQUAL_TO,
@@ -48,8 +48,8 @@ struct Criteria {
 	uint32 argument;
 	/** How to do the comparison */
 	CriteriaOperator criteriaOperator;
-	/** Whether 'argument' is the id of a global state (true) or a pure value (false) */
-	bool isArgumentAnId;
+	/** Whether 'argument' is the key of a global state (true) or a pure value (false) */
+	bool argumentIsAKey;
 };
 
 enum StateFlags {
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index a0ecf6bb4c..6bf73733e5 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -111,10 +111,10 @@ Criteria ScriptManager::parseCriteria(Common::SeekableReadStream &stream) const
 		token = tokenizer.nextToken();
 		if (token.contains('[')) {
 			sscanf(token.c_str(), "[%u]", &(criteria.argument));
-			criteria.isArgumentAnId = true;
+			criteria.argumentIsAKey = true;
 		} else {
 			sscanf(token.c_str(), "%u", &(criteria.argument));
-			criteria.isArgumentAnId = false;
+			criteria.argumentIsAKey = false;
 		}
 
 		line = stream.readLine();
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index ffda12ac1a..bec8827583 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -31,14 +31,13 @@
 
 #include "engines/engine.h"
 
-#include "zvision/script_manager.h"
-
 #include "gui/debugger.h"
  
 namespace ZVision {
 
 struct ZVisionGameDescription;
 class Console;
+class ScriptManager;
  
 // our engine debug channels
 enum {
-- 
cgit v1.2.3