[Scummvm-cvs-logs] scummvm master -> adb53422471386b4eb3551fe15a489bcd88b6571

[lordhoto]

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:
adb5342247 TINSEL: Take advantage of KeyState::hasFlags.


Commit: adb53422471386b4eb3551fe15a489bcd88b6571
    https://github.com/scummvm/scummvm/commit/adb53422471386b4eb3551fe15a489bcd88b6571
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-29T16:53:01-08:00

Commit Message:
TINSEL: Take advantage of KeyState::hasFlags.

Changed paths:
    engines/tinsel/tinsel.cpp



diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 635845a..cd0f9b9 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -1177,7 +1177,7 @@ void TinselEngine::ProcessKeyEvent(const Common::Event &event) {
 	switch (event.kbd.keycode) {
 	case Common::KEYCODE_d:
 		// Checks for CTRL flag, ignoring all the sticky flags
-		if ((Common::KBD_CTRL == (event.kbd.flags & ~(Common::KBD_NUM|Common::KBD_CAPS|Common::KBD_SCRL))) && (event.type == Common::EVENT_KEYDOWN)) {
+		if (event.kbd.hasFlags(Common::KBD_CTRL) && event.type == Common::EVENT_KEYDOWN) {
 			// Activate the debugger
 			assert(_console);
 			_console->attach();