[Scummvm-cvs-logs] scummvm master -> 79dd3274111132eb89fe104406110541bf2329de
sev-
sev at scummvm.org
Mon Sep 16 17:30:08 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
79dd327411 FULLPIPE: Fix cheat codes. Bug in original?
Commit: 79dd3274111132eb89fe104406110541bf2329de
https://github.com/scummvm/scummvm/commit/79dd3274111132eb89fe104406110541bf2329de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-16T00:48:47-07:00
Commit Message:
FULLPIPE: Fix cheat codes. Bug in original?
Changed paths:
engines/fullpipe/fullpipe.cpp
engines/fullpipe/input.cpp
engines/fullpipe/scenes.cpp
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 6a4a587..99de4dc 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 c4af54d..dfd8d32 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 f6620a2..c9cdc0a 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;
More information about the Scummvm-git-logs
mailing list