[Scummvm-cvs-logs] scummvm master -> 8e733f03b766bb741b3b87842607ba11c3652496

lskovlun lskovlun at sprogklog.dk
Mon Jan 14 20:16:52 CET 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:
8e733f03b7 SCI: Event handling: Include modifier flags in null events.


Commit: 8e733f03b766bb741b3b87842607ba11c3652496
    https://github.com/scummvm/scummvm/commit/8e733f03b766bb741b3b87842607ba11c3652496
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2013-01-14T11:11:34-08:00

Commit Message:
SCI: Event handling: Include modifier flags in null events.
Fixes bug #3580473

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 14443db..90351a4 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -161,8 +161,15 @@ SciEvent EventManager::getScummVMEvent() {
 	noEvent.mousePos = input.mousePos = mousePos;
 
 	if (!found || ev.type == Common::EVENT_MOUSEMOVE)
-		return noEvent;
+	{
+		int modifiers = em->getModifierState();
+	  	noEvent.modifiers =
+			((modifiers & Common::KBD_ALT) ? SCI_KEYMOD_ALT : 0) |
+			((modifiers & Common::KBD_CTRL) ? SCI_KEYMOD_CTRL : 0) |
+			((modifiers & Common::KBD_SHIFT) ? SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT : 0);
 
+		return noEvent;
+	}
 	if (ev.type == Common::EVENT_QUIT) {
 		input.type = SCI_EVENT_QUIT;
 		return input;






More information about the Scummvm-git-logs mailing list