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

[digitall]

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:
cc02255740 CGE: Fix for missing inventory selection by numeric keys.


Commit: cc02255740a42177c4ce7a8af892ba7f05cf6fae
    https://github.com/scummvm/scummvm/commit/cc02255740a42177c4ce7a8af892ba7f05cf6fae
Author: D G Turner (digitall at scummvm.org)
Date: 2012-07-03T13:43:04-07:00

Commit Message:
CGE: Fix for missing inventory selection by numeric keys.

This fixes bug #3539671.

Changed paths:
    engines/cge/events.cpp



diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index c8baf4e..99855e1 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -112,6 +112,16 @@ bool Keyboard::getKey(Common::Event &event) {
 			_vm->_commandHandler->addCommand(kCmdLevel, -1, keycode - '0', NULL);
 			return false;
 		}
+		// Fallthrough intended
+	case Common::KEYCODE_5:
+	case Common::KEYCODE_6:
+	case Common::KEYCODE_7:
+	case Common::KEYCODE_8:
+		if (event.type == Common::EVENT_KEYDOWN && !(event.kbd.flags & Common::KBD_ALT) && keycode != '0') {
+			_vm->selectPocket(keycode - '1');
+			return false;
+		}
+		break;
 	default:
 		break;
 	}