[Scummvm-git-logs] scummvm master -> d9d325ac6c97cb53be64639cf5d6b8a2038c9d0f

[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:
d9d325ac6c TITANIC: Allow GMM/F7 loading in prologue before player gets the PET


Commit: d9d325ac6c97cb53be64639cf5d6b8a2038c9d0f
    https://github.com/scummvm/scummvm/commit/d9d325ac6c97cb53be64639cf5d6b8a2038c9d0f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-18T22:42:21-04:00

Commit Message:
TITANIC: Allow GMM/F7 loading in prologue before player gets the PET

Changed paths:
    engines/titanic/titanic.cpp


diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index 5fd7237..9b1b9d6 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -181,23 +181,30 @@ bool TitanicEngine::canLoadGameStateCurrently() {
 	CGameManager *gameManager = _window->_gameManager;
 	CScreenManager *screenMan = CScreenManager::_screenManagerPtr;
 
-	if (!_window->_inputAllowed || !gameManager->_gameState._petActive)
+	if (!_window->_inputAllowed)
 		return false;
 	if (screenMan && screenMan->_inputHandler->isLocked())
 		return false;
 
 	CProjectItem *project = gameManager->_project;
 	if (project) {
-		CPetControl *pet = project->getPetControl();
-		if (pet && !pet->isAreaUnlocked())
-			return false;
+		if (gameManager->_gameState._petActive) {
+			CPetControl *pet = project->getPetControl();
+			if (pet && !pet->isAreaUnlocked())
+				return false;
+		}
+	} else {
+		return false;
 	}
 
 	return true;
 }
 
 bool TitanicEngine::canSaveGameStateCurrently() {
-	return canLoadGameStateCurrently();
+	CGameManager *gameManager = _window->_gameManager;
+
+	return gameManager->_gameState._petActive &&
+		canLoadGameStateCurrently();
 }
 
 Common::Error TitanicEngine::loadGameState(int slot) {