[Scummvm-git-logs] scummvm master -> 2edd59d0b8e48d354e085beacbe4f2c4a1e16489

[dreammaster]

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:
2edd59d0b8 TITANIC: Fix Tab key toggle for Starfield/Photo being broken


Commit: 2edd59d0b8e48d354e085beacbe4f2c4a1e16489
    https://github.com/scummvm/scummvm/commit/2edd59d0b8e48d354e085beacbe4f2c4a1e16489
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-20T22:55:40-04:00

Commit Message:
TITANIC: Fix Tab key toggle for Starfield/Photo being broken

Changed paths:
    engines/titanic/pet_control/pet_control.cpp


diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index fd77f44..73f6df5 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -336,8 +336,10 @@ bool CPetControl::KeyCharMsg(CKeyCharMsg *msg) {
 	if (!result) {
 		switch (msg->_key) {
 		case Common::KEYCODE_TAB:
-			setArea(PET_INVENTORY);
-			result = true;
+			if (isAreaUnlocked()) {
+				setArea(PET_INVENTORY);
+				result = true;
+			}
 			break;
 		default:
 			break;