[Scummvm-cvs-logs] scummvm master -> 78905e0ab65a1c8957686fde613dd9f3038577ac

m-kiewitz m_kiewitz at users.sourceforge.net
Tue Feb 9 19:41:51 CET 2016


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:
78905e0ab6 AGI: Only set VAR_KEY,when no controller/direction


Commit: 78905e0ab65a1c8957686fde613dd9f3038577ac
    https://github.com/scummvm/scummvm/commit/78905e0ab65a1c8957686fde613dd9f3038577ac
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-09T19:41:59+01:00

Commit Message:
AGI: Only set VAR_KEY,when no controller/direction

Fixes Mixed Up Mother Goose Apple IIgs save/restore prompt

Changed paths:
    engines/agi/cycle.cpp



diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 6c3f2d6..aba0ef2 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -219,9 +219,10 @@ uint16 AgiEngine::processAGIEvents() {
 		// no inner loop active at the moment, regular processing
 
 		if (key) {
-			setVar(VM_VAR_KEY, key & 0xFF);
 			if (!handleController(key)) {
 				if (key) {
+					// Only set VAR_KEY, when no controller/direction was detected
+					setVar(VM_VAR_KEY, key & 0xFF);
 					if (_text->promptIsEnabled()) {
 						_text->promptKeyPress(key);
 					}






More information about the Scummvm-git-logs mailing list