[Scummvm-cvs-logs] scummvm master -> 4e290bf47533d6ec8f45dfdecb229ec06fea0a75

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f5a77e1380 TOON: Do not use KeyState::hasFlags when only presence of any flag should be checked.
b91e96e26a TOON: Ignore hotkeys when *any* modifier is used.
4e290bf475 TOON: Use keycodes for hotkey handling.


Commit: f5a77e1380db73b8d4a898e30a4e2b80366f5894
    https://github.com/scummvm/scummvm/commit/f5a77e1380db73b8d4a898e30a4e2b80366f5894
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-02-14T09:21:57-08:00

Commit Message:
TOON: Do not use KeyState::hasFlags when only presence of any flag should be checked.

hasFlags has the semantics to check whether *all* of the supplied flags are
active. Toon looks like it rather wants to know whether any modifier is
active and thus not use hasFlags.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 7b1456b..d7895b5 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -184,7 +184,7 @@ void ToonEngine::parseInput() {
 	Common::Event event;
 	while (_event->pollEvent(event)) {
 
-		bool hasModifier = event.kbd.hasFlags(Common::KBD_ALT|Common::KBD_CTRL|Common::KBD_SHIFT);
+		const bool hasModifier = (event.kbd.flags & (Common::KBD_ALT|Common::KBD_CTRL|Common::KBD_SHIFT)) != 0;
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if ((event.kbd.ascii == 27 || event.kbd.ascii == 32) && !hasModifier) {


Commit: b91e96e26aaec3fc9065099c3e212b6571bfc4cf
    https://github.com/scummvm/scummvm/commit/b91e96e26aaec3fc9065099c3e212b6571bfc4cf
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-02-14T09:21:57-08:00

Commit Message:
TOON: Ignore hotkeys when *any* modifier is used.

This makes, for example, META+d also be ignored and not only CTRL+d etc.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index d7895b5..bbd8118 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -184,7 +184,7 @@ void ToonEngine::parseInput() {
 	Common::Event event;
 	while (_event->pollEvent(event)) {
 
-		const bool hasModifier = (event.kbd.flags & (Common::KBD_ALT|Common::KBD_CTRL|Common::KBD_SHIFT)) != 0;
+		const bool hasModifier = (event.kbd.flags & Common::KBD_NON_STICKY) != 0;
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if ((event.kbd.ascii == 27 || event.kbd.ascii == 32) && !hasModifier) {


Commit: 4e290bf47533d6ec8f45dfdecb229ec06fea0a75
    https://github.com/scummvm/scummvm/commit/4e290bf47533d6ec8f45dfdecb229ec06fea0a75
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-02-14T09:21:57-08:00

Commit Message:
TOON: Use keycodes for hotkey handling.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index bbd8118..72cf57a 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -187,7 +187,7 @@ void ToonEngine::parseInput() {
 		const bool hasModifier = (event.kbd.flags & Common::KBD_NON_STICKY) != 0;
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
-			if ((event.kbd.ascii == 27 || event.kbd.ascii == 32) && !hasModifier) {
+			if ((event.kbd.keycode == Common::KEYCODE_ESCAPE || event.kbd.keycode == Common::KEYCODE_SPACE) && !hasModifier) {
 				_audioManager->stopCurrentVoice();
 			}
 			if (event.kbd.keycode == Common::KEYCODE_F5 && !hasModifier) {
@@ -198,21 +198,21 @@ void ToonEngine::parseInput() {
 				if (canLoadGameStateCurrently())
 					loadGame(-1);
 			}
-			if (event.kbd.ascii == 't' && !hasModifier) {
+			if (event.kbd.keycode == Common::KEYCODE_t && !hasModifier) {
 				_showConversationText = !_showConversationText;
 			}
-			if (event.kbd.ascii == 'm' && !hasModifier) {
+			if (event.kbd.keycode == Common::KEYCODE_m && !hasModifier) {
 				_audioManager->muteMusic(!_audioManager->isMusicMuted());
 			}
-			if (event.kbd.ascii == 'd' && !hasModifier) {
+			if (event.kbd.keycode == Common::KEYCODE_d && !hasModifier) {
 				_audioManager->muteVoice(!_audioManager->isVoiceMuted());
 			}
-			if (event.kbd.ascii == 's' && !hasModifier) {
+			if (event.kbd.keycode == Common::KEYCODE_s && !hasModifier) {
 				_audioManager->muteSfx(!_audioManager->isSfxMuted());
 			}
 
 			if (event.kbd.flags & Common::KBD_ALT) {
-				int slotNum = event.kbd.ascii - '0';
+				int slotNum = event.kbd.keycode - (event.kbd.keycode >= Common::KEYCODE_KP0 ? Common::KEYCODE_KP0 : Common::KEYCODE_0);
 				if (slotNum >= 0 && slotNum <= 9 && canSaveGameStateCurrently()) {
 					if (saveGame(slotNum, "")) {
 						// ok
@@ -229,7 +229,7 @@ void ToonEngine::parseInput() {
 			}
 
 			if (event.kbd.flags & Common::KBD_CTRL) {
-				int slotNum = event.kbd.ascii - '0';
+				int slotNum = event.kbd.keycode - (event.kbd.keycode >= Common::KEYCODE_KP0 ? Common::KEYCODE_KP0 : Common::KEYCODE_0);
 				if (slotNum >= 0 && slotNum <= 9 && canLoadGameStateCurrently()) {
 					if (loadGame(slotNum)) {
 						// ok