engines/zvision/core/events.cpp

@@ -30,8 +30,6 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/animation/rlf_animation.h"
 #include "zvision/core/menu.h"
-#include "zvision/utility/win_keys.h"
-#include "zvision/core/menu.h"
 #include "zvision/sound/zork_raw.h"
 
 #include "common/events.h"
@@ -71,9 +69,8 @@ void ZVision::cheatCodes(uint8 key) {
 	pushKeyToCheatBuf(key);
 
 	if (getGameId() == GID_GRANDINQUISITOR) {
-
 		if (checkCode("IMNOTDEAF")) {
-			// Unknow cheat
+			// Unknown cheat
 			showDebugMsg(Common::String::format("IMNOTDEAF cheat or debug, not implemented"));
 		}
 
@@ -93,8 +90,12 @@ void ZVision::cheatCodes(uint8 key) {
 		if (checkCode("MIKESPANTS")) {
 			_scriptManager->changeLocation('g', 'j', 't', 'm', 0);
 		}
-	} else if (getGameId() == GID_NEMESIS) {
 
+		// There are 3 more cheats in script files:
+		// - "EAT ME": gjcr.scr
+		// - "WHOAMI": hp1e.scr
+		// - "HUISOK": uh1f.scr
+	} else if (getGameId() == GID_NEMESIS) {
 		if (checkCode("CHLOE")) {
 			_scriptManager->changeLocation('t', 'm', '2', 'g', 0);
 			_scriptManager->setStateValue(224, 1);
@@ -211,7 +212,7 @@ void ZVision::processEvents() {
 				break;
 			}
 
-			uint8 vkKey = VKkey(_event.kbd.keycode);
+			uint8 vkKey = getZvisionKey(_event.kbd.keycode);
 
 			_scriptManager->setStateValue(StateKey_KeyPress, vkKey);
 
@@ -339,4 +340,106 @@ void ZVision::onMouseMove(const Common::Point &pos) {
 	}
 }
 
+uint8 ZVision::getZvisionKey(Common::KeyCode scummKeyCode) {
+	if (scummKeyCode >= Common::KEYCODE_a && scummKeyCode <= Common::KEYCODE_z)
+		return 0x41 + scummKeyCode - Common::KEYCODE_a;
+	if (scummKeyCode >= Common::KEYCODE_0 && scummKeyCode <= Common::KEYCODE_9)
+		return 0x30 + scummKeyCode - Common::KEYCODE_0;
+	if (scummKeyCode >= Common::KEYCODE_F1 && scummKeyCode <= Common::KEYCODE_F15)
+		return 0x70 + scummKeyCode - Common::KEYCODE_F1;
+	if (scummKeyCode >= Common::KEYCODE_KP0 && scummKeyCode <= Common::KEYCODE_KP9)
+		return 0x60 + scummKeyCode - Common::KEYCODE_KP0;
+
+	switch (scummKeyCode) {
+	case Common::KEYCODE_BACKSPACE:
+		return 0x8;
+	case Common::KEYCODE_TAB:
+		return 0x9;
+	case Common::KEYCODE_CLEAR:
+		return 0xC;
+	case Common::KEYCODE_RETURN:
+		return 0xD;
+	case Common::KEYCODE_CAPSLOCK:
+		return 0x14;
+	case Common::KEYCODE_ESCAPE:
+		return 0x1B;
+	case Common::KEYCODE_SPACE:
+		return 0x20;
+	case Common::KEYCODE_PAGEUP:
+		return 0x21;
+	case Common::KEYCODE_PAGEDOWN:
+		return 0x22;
+	case Common::KEYCODE_END:
+		return 0x23;
+	case Common::KEYCODE_HOME:
+		return 0x24;
+	case Common::KEYCODE_LEFT:
+		return 0x25;
+	case Common::KEYCODE_UP:
+		return 0x26;
+	case Common::KEYCODE_RIGHT:
+		return 0x27;
+	case Common::KEYCODE_DOWN:
+		return 0x28;
+	case Common::KEYCODE_PRINT:
+		return 0x2A;
+	case Common::KEYCODE_INSERT:
+		return 0x2D;
+	case Common::KEYCODE_DELETE:
+		return 0x2E;
+	case Common::KEYCODE_HELP:
+		return 0x2F;
+	case Common::KEYCODE_KP_MULTIPLY:
+		return 0x6A;
+	case Common::KEYCODE_KP_PLUS:
+		return 0x6B;
+	case Common::KEYCODE_KP_MINUS:
+		return 0x6D;
+	case Common::KEYCODE_KP_PERIOD:
+		return 0x6E;
+	case Common::KEYCODE_KP_DIVIDE:
+		return 0x6F;
+	case Common::KEYCODE_NUMLOCK:
+		return 0x90;
+	case Common::KEYCODE_SCROLLOCK:
+		return 0x91;
+	case Common::KEYCODE_LSHIFT:
+		return 0xA0;
+	case Common::KEYCODE_RSHIFT:
+		return 0xA1;
+	case Common::KEYCODE_LCTRL:
+		return 0xA2;
+	case Common::KEYCODE_RCTRL:
+		return 0xA3;
+	case Common::KEYCODE_MENU:
+		return 0xA5;
+	case Common::KEYCODE_LEFTBRACKET:
+		return 0xDB;
+	case Common::KEYCODE_RIGHTBRACKET:
+		return 0xDD;
+	case Common::KEYCODE_SEMICOLON:
+		return 0xBA;
+	case Common::KEYCODE_BACKSLASH:
+		return 0xDC;
+	case Common::KEYCODE_QUOTE:
+		return 0xDE;
+	case Common::KEYCODE_SLASH:
+		return 0xBF;
+	case Common::KEYCODE_TILDE:
+		return 0xC0;
+	case Common::KEYCODE_COMMA:
+		return 0xBC;
+	case Common::KEYCODE_PERIOD:
+		return 0xBE;
+	case Common::KEYCODE_MINUS:
+		return 0xBD;
+	case Common::KEYCODE_PLUS:
+		return 0xBB;
+	default:
+		return 0;
+	}
+
+	return 0;
+}
+
 } // End of namespace ZVision

engines/zvision/core/search_manager.cpp

@@ -21,12 +21,12 @@
 */
 
 #include "common/debug.h"
-
-#include "zvision/core/search_manager.h"
-#include "zvision/archives/zfs_archive.h"
 #include "common/fs.h"
 #include "common/stream.h"
 
+#include "zvision/core/search_manager.h"
+#include "zvision/utility/zfs_archive.h"
+
 namespace ZVision {
 
 SearchManager::SearchManager(const Common::String &rootPath, int depth) {

engines/zvision/module.mk

@@ -3,7 +3,6 @@ MODULE := engines/zvision
 MODULE_OBJS := \
 	animation/meta_animation.o \
 	animation/rlf_animation.o \
-	archives/zfs_archive.o \
 	core/console.o \
 	core/events.o \
 	core/menu.o \
@@ -48,7 +47,7 @@ MODULE_OBJS := \
 	utility/clock.o \
 	utility/lzss_read_stream.o \
 	utility/utility.o \
-	utility/win_keys.o \
+	utility/zfs_archive.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o

engines/zvision/archives/zfs_archive.cpp → engines/zvision/utility/zfs_archive.cpp

@@ -21,13 +21,12 @@
  */
 
 #include "common/scummsys.h"
-
-#include "zvision/archives/zfs_archive.h"
-
 #include "common/memstream.h"
 #include "common/debug.h"
 #include "common/file.h"
 
+#include "zvision/utility/zfs_archive.h"
+
 namespace ZVision {
 
 ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) {

engines/zvision/zvision.cpp

@@ -23,20 +23,19 @@
 #include "common/scummsys.h"
 
 #include "zvision/zvision.h"
-
 #include "zvision/core/console.h"
 #include "zvision/scripting/script_manager.h"
 #include "zvision/graphics/render_manager.h"
 #include "zvision/cursors/cursor_manager.h"
 #include "zvision/core/save_manager.h"
 #include "zvision/text/string_manager.h"
-#include "zvision/archives/zfs_archive.h"
 #include "zvision/detection.h"
 #include "zvision/core/menu.h"
 #include "zvision/core/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/fonts/truetype_font.h"
 #include "zvision/core/midi.h"
+#include "zvision/utility/zfs_archive.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"