From 79dd3274111132eb89fe104406110541bf2329de Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 16 Sep 2013 05:45:56 +0300
Subject: FULLPIPE: Fix cheat codes. Bug in original?

---
 engines/fullpipe/fullpipe.cpp | 2 +-
 engines/fullpipe/input.cpp    | 1 -
 engines/fullpipe/scenes.cpp   | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 6a4a587ff7..99de4dc0d4 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -260,7 +260,7 @@ void FullpipeEngine::updateEvents() {
 				}
 
 				ex = new ExCommand(0, 17, 36, 0, 0, 0, 1, 0, 0, 0);
-				ex->_keyCode = 83;
+				ex->_keyCode = event.kbd.keycode;
 				ex->_excFlags |= 3;
 				ex->handle();
 				break;
diff --git a/engines/fullpipe/input.cpp b/engines/fullpipe/input.cpp
index c4af54ddc3..dfd8d32168 100644
--- a/engines/fullpipe/input.cpp
+++ b/engines/fullpipe/input.cpp
@@ -165,7 +165,6 @@ void FullpipeEngine::defHandleKeyDown(int key) {
 		return;
 	}
 
-	warning("%d %d", _currentCheat, _currentCheatPos);
 	if (toupper(key) != input_cheats[_currentCheat][_currentCheatPos]) {
 		_currentCheat = -1;
 
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index f6620a2fc7..c9cdc0a3d8 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -731,6 +731,8 @@ int global_messageHandler1(ExCommand *cmd) {
 			}
 			break;
 		case 36: // keydown
+			g_fullpipe->defHandleKeyDown(cmd->_keyCode);
+
 			switch (cmd->_keyCode) {
 			case '\x1B': // ESC
 				if (g_fullpipe->_currentScene) {
@@ -768,7 +770,6 @@ int global_messageHandler1(ExCommand *cmd) {
 				cmd->_messageKind = 0;
 				break;
 			default:
-				g_fullpipe->defHandleKeyDown(cmd->_keyCode);
 				break;
 			}
 			break;
-- 
cgit v1.2.3