From 84a2651e63addeb55c61ed6244c77073f8921193 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sun, 24 May 2009 14:33:41 +0000
Subject: LOL: fixed some input code issues: - party would move 2 steps instead
 of one when using keyboad while magic menu was open - viewing notes would
 abort at once instead of waiting for the next click

svn-id: r40863
---
 engines/kyra/kyra_v1.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/kyra/kyra_v1.cpp')

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 8585b0fced..d642918667 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -224,7 +224,7 @@ void KyraEngine_v1::setMousePos(int x, int y) {
 	_system->warpMouse(x, y);
 }
 
-int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) {
+int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) {
 	_isSaveAllowed = mainLoop;
 	updateInput();
 	_isSaveAllowed = false;
@@ -365,7 +365,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) {
 	GUI *guiInstance = gui();
 	if (guiInstance) {
 		if (keys)
-			return guiInstance->processButtonList(buttonList, keys | 0x8000, mouseWheel);
+			return guiInstance->processButtonList(buttonList, keys | eventFlag, mouseWheel);
 		else
 			return guiInstance->processButtonList(buttonList, 0, mouseWheel);
 	} else {
-- 
cgit v1.2.3