From 11576c5aa940bbdf90f6fb79f39fbc23118cfd6c Mon Sep 17 00:00:00 2001
From: RichieSams <adastley@gmail.com>
Date: Sun, 29 Sep 2013 21:41:43 -0500
Subject: [PATCH] ZVISION: Rename ZVisionGameIds to use standard format

---
 engines/zvision/cursor_manager.cpp | 8 ++++----
 engines/zvision/detection.cpp      | 6 +++---
 engines/zvision/detection.h        | 6 +++---
 engines/zvision/string_manager.cpp | 4 ++--
 engines/zvision/zork_raw.cpp       | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp
index 50fa5031b27..69a4280157f 100644
--- a/engines/zvision/cursor_manager.cpp
+++ b/engines/zvision/cursor_manager.cpp
@@ -47,10 +47,10 @@ CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixel
 		  _pixelFormat(pixelFormat),
 		  _cursorIsPushed(false) {
 	// WARNING: The index IDLE_CURSOR_INDEX is hardcoded. If you change the order of _cursorNames/_zgiCursorFileNames/_zNemCursorFileNames, you HAVE to change the index accordingly
-	if (_engine->getGameId() == ZorkNemesis) {
+	if (_engine->getGameId() == GID_NEMESIS) {
 		Common::String name(Common::String::format("%sa.zcr", _zNemCursorFileNames[IDLE_CURSOR_INDEX]));
 		_idleCursor = ZorkCursor(name);
-	} else if (_engine->getGameId() == ZorkGrandInquisitor) {
+	} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
 		_idleCursor = ZorkCursor(_zgiCursorFileNames[IDLE_CURSOR_INDEX]);
 	}
 }
@@ -77,7 +77,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
 	}
 
 	for (int i = 0; i < NUM_CURSORS; i++) {
-		if (_engine->getGameId() == ZorkNemesis) {
+		if (_engine->getGameId() == GID_NEMESIS) {
 			if (cursorName.equals(_cursorNames[i])) {
 				_currentCursor = cursorName;
 
@@ -88,7 +88,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed)
 				changeCursor(ZorkCursor(name));
 				return;
 			}
-		} else if (_engine->getGameId() == ZorkGrandInquisitor) {
+		} else if (_engine->getGameId() == GID_GRANDINQUISITOR) {
 			if (cursorName.equals(_cursorNames[i])) {
 				_currentCursor = cursorName;
 
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index d9bb692f070..28b7134fae4 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -68,7 +68,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
-		ZorkNemesis
+		GID_NEMESIS
 	},
 
 	{
@@ -82,12 +82,12 @@ static const ZVisionGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
-		ZorkGrandInquisitor
+		GID_GRANDINQUISITOR
 	},
 
 	{
 		AD_TABLE_END_MARKER,
-		None
+		GID_NONE
 	}
 };
 
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index f08cfd2fe13..f9acb4d1446 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -28,9 +28,9 @@
 namespace ZVision {
 
 enum ZVisionGameId {
-	None = 0,
-	ZorkNemesis = 1,
-	ZorkGrandInquisitor = 2
+	GID_NONE = 0,
+	GID_NEMESIS = 1,
+	GID_GRANDINQUISITOR = 2
 };
 
 struct ZVisionGameDescription {
diff --git a/engines/zvision/string_manager.cpp b/engines/zvision/string_manager.cpp
index d069e28a767..b2d19d904e9 100644
--- a/engines/zvision/string_manager.cpp
+++ b/engines/zvision/string_manager.cpp
@@ -47,10 +47,10 @@ StringManager::~StringManager() {
 }
 
 void StringManager::initialize(ZVisionGameId gameId) {
-	if (gameId == ZorkNemesis) {
+	if (gameId == GID_NEMESIS) {
 		// TODO: Check this hardcoded filename against all versions of Nemesis
 		parseStrFile("nemesis.str");
-	} else if (gameId == ZorkGrandInquisitor) {
+	} else if (gameId == GID_GRANDINQUISITOR) {
 		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
 		parseStrFile("inquis.str");
 	}
diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp
index 92f659203b3..ebb75087487 100644
--- a/engines/zvision/zork_raw.cpp
+++ b/engines/zvision/zork_raw.cpp
@@ -164,13 +164,13 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 
 	SoundParams soundParams;
 
-	if (engine->getGameId() == ZorkNemesis) {
+	if (engine->getGameId() == GID_NEMESIS) {
 		for (int i = 0; i < 6; i++) {
 			if (zNemSoundParamLookupTable[i].identifier == (fileName[6]))
 				soundParams = zNemSoundParamLookupTable[i];
 		}
 	}
-	else if (engine->getGameId() == ZorkGrandInquisitor) {
+	else if (engine->getGameId() == GID_GRANDINQUISITOR) {
 		for (int i = 0; i < 6; i++) {
 			if (zgiSoundParamLookupTable[i].identifier == (fileName[7]))
 				soundParams = zgiSoundParamLookupTable[i];