[Scummvm-cvs-logs] scummvm master -> 0776709f3175da3ebca69f8a4866d4d98a1e9be9

[bluegr]

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:
0776709f31 ZVISION: Do not process cheat codes while in the game menus


Commit: 0776709f3175da3ebca69f8a4866d4d98a1e9be9
    https://github.com/scummvm/scummvm/commit/0776709f3175da3ebca69f8a4866d4d98a1e9be9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-21T00:33:54+02:00

Commit Message:
ZVISION: Do not process cheat codes while in the game menus

This prevents the cheat codes from being accidentally triggered when
using the save screen, for example

Changed paths:
    engines/zvision/core/events.cpp



diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 4c7d395..9cf5d04 100644
--- a/engines/zvision/core/events.cpp
+++ b/engines/zvision/core/events.cpp
@@ -93,6 +93,11 @@ void ZVision::shortKeys(Common::Event event) {
 }
 
 void ZVision::cheatCodes(uint8 key) {
+	Location loc = _scriptManager->getCurrentLocation();
+	// Do not process cheat codes while in the game menus
+	if (loc.world == 'g' && loc.room == 'j')
+		return;
+
 	pushKeyToCheatBuf(key);
 
 	if (getGameId() == GID_GRANDINQUISITOR) {
@@ -146,7 +151,6 @@ void ZVision::cheatCodes(uint8 key) {
 		}
 
 		if (checkCode("HELLOSAILOR")) {
-			Location loc = _scriptManager->getCurrentLocation();
 			Audio::AudioStream *soundStream;
 			if (loc.world == 'v' && loc.room == 'b' && loc.node == '1' && loc.view == '0') {
 				soundStream = makeRawZorkStream("v000hpta.raw", this);