From ef330ed9b4e5d6252134ed137b042593f79d02a9 Mon Sep 17 00:00:00 2001
From: Yotam Barnoy
Date: Sun, 21 Feb 2010 04:04:13 +0000
Subject: Patch for bug 2943361 by littleboy, adding full kb modifier support
 to all engines + GUI and proper keypad handling

svn-id: r48101
---
 engines/sword2/sword2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sword2')

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index cf9e67e178..822946f42d 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -491,9 +491,9 @@ Common::Error Sword2Engine::run() {
 		KeyboardEvent *ke = keyboardEvent();
 
 		if (ke) {
-			if ((ke->kbd.flags == Common::KBD_CTRL && ke->kbd.keycode == Common::KEYCODE_d) || ke->kbd.ascii == '#' || ke->kbd.ascii == '~') {
+			if ((ke->kbd.hasFlags(Common::KBD_CTRL) && ke->kbd.keycode == Common::KEYCODE_d) || ke->kbd.ascii == '#' || ke->kbd.ascii == '~') {
 				_debugger->attach();
-			} else if (ke->kbd.flags == 0 || ke->kbd.flags == Common::KBD_SHIFT) {
+			} else if (ke->kbd.hasFlags(0) || ke->kbd.hasFlags(Common::KBD_SHIFT)) {
 				switch (ke->kbd.keycode) {
 				case Common::KEYCODE_p:
 					if (_gamePaused)
@@ -654,8 +654,8 @@ void Sword2Engine::parseInputEvents() {
 	while (_eventMan->pollEvent(event)) {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
-			if (event.kbd.flags == Common::KBD_CTRL) {
-				if (event.kbd.keycode == 'f') {
+			if (event.kbd.hasFlags(Common::KBD_CTRL)) {
+				if (event.kbd.keycode == Common::KEYCODE_f) {
 					if (_gameSpeed == 1)
 						_gameSpeed = 2;
 					else
-- 
cgit v1.2.3