[Scummvm-cvs-logs] scummvm master -> 4201d4ead031629446c6227712d98a8a56a23ca9

[Strangerke]

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:
4201d4ead0 CGE: Use keycode instead of ascii value


Commit: 4201d4ead031629446c6227712d98a8a56a23ca9
    https://github.com/scummvm/scummvm/commit/4201d4ead031629446c6227712d98a8a56a23ca9
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-07-03T14:55:48-07:00

Commit Message:
CGE: Use keycode instead of ascii value

Changed paths:
    engines/cge/events.cpp



diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index 99855e1..98a39a9 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -109,7 +109,7 @@ bool Keyboard::getKey(Common::Event &event) {
 	case Common::KEYCODE_3:
 	case Common::KEYCODE_4:
 		if (event.kbd.flags & Common::KBD_ALT) {
-			_vm->_commandHandler->addCommand(kCmdLevel, -1, keycode - '0', NULL);
+			_vm->_commandHandler->addCommand(kCmdLevel, -1, keycode - Common::KEYCODE_0, NULL);
 			return false;
 		}
 		// Fallthrough intended
@@ -117,8 +117,8 @@ bool Keyboard::getKey(Common::Event &event) {
 	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');
+		if (event.type == Common::EVENT_KEYDOWN && !(event.kbd.flags & Common::KBD_ALT) && keycode != Common::KEYCODE_0) {
+			_vm->selectPocket(keycode - Common::KEYCODE_1);
 			return false;
 		}
 		break;