4 files changed, 52 insertions, 10 deletions

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 5488ae5be4..8c87c90203 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -23,22 +23,17 @@
 
 #include "base/plugins.h"
 
-#include "engines/advancedDetector.h"
-
 #include "common/translation.h"
 #include "common/savefile.h"
 #include "common/str-array.h"
 #include "common/system.h"
 
 #include "zvision/zvision.h"
+#include "zvision/detection.h"
 
 
 namespace ZVision {
 
-struct ZVisionGameDescription {
-	ADGameDescription desc;
-};
-
 uint32 ZVision::getFeatures() const {
 	return _gameDescription->desc.flags;
 }
@@ -47,7 +42,8 @@ Common::Language ZVision::getLanguage() const {
 	return _gameDescription->desc.language;
 }
 
-}
+} // End of namespace ZVision
+
 
 static const PlainGameDescriptor zVisionGames[] = {
 	{"zvision",  "ZVision Game"},
@@ -72,6 +68,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
+		ZorkNemesis
 	},
 
 	{ AD_TABLE_END_MARKER }
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
new file mode 100644
index 0000000000..b1e5dcbe01
--- /dev/null
+++ b/engines/zvision/detection.h
@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#ifndef ZVISION_DETECTION_H
+#define ZVISION_DETECTION_H
+
+#include "engines/advancedDetector.h"
+
+namespace ZVision {
+
+enum ZVisionGameId {
+	ZorkNemesis,
+	ZorkGrandInquisitor
+};
+
+struct ZVisionGameDescription {
+	ADGameDescription desc;
+	ZVisionGameId gameId;
+};
+
+}
+
+#endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index ba08122ba5..4ce775db86 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -36,6 +36,7 @@
 #include "zvision/console.h"
 #include "zvision/script_manager.h"
 #include "zvision/zfs_archive.h"
+#include "zvision/detection.h"
 
 #include "zvision/utility.h"
 
@@ -154,8 +155,8 @@ Common::RandomSource *ZVision::getRandomSource() const {
 	return _rnd;
 }
 
-Audio::Mixer *ZVision::getMixer() const {
-	return _mixer;
+ZVisionGameId ZVision::getGameId() const {
+	return _gameDescription->gameId;
 }
 
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 11773a33ad..17a7c026f1 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -31,6 +31,8 @@
 
 #include "engines/engine.h"
 
+#include "zvision/detection.h"
+
 #include "gui/debugger.h"
  
 namespace ZVision {
@@ -76,7 +78,7 @@ public:
 	virtual Common::Error run();
 	ScriptManager *getScriptManager() const;
 	Common::RandomSource *getRandomSource() const;
-	Audio::Mixer *getMixer() const;
+	ZVisionGameId getGameId() const;
 
 	void renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y);
 	void startVideo(Video::VideoDecoder *videoDecoder);