[Scummvm-git-logs] scummvm master -> 1e0a22db5c7c336b1e663b8dfd7ee6192f35030f

[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:
1e0a22db5c TITANIC: Fix occassional PET mixup when toggling nav helmet on & off


Commit: 1e0a22db5c7c336b1e663b8dfd7ee6192f35030f
    https://github.com/scummvm/scummvm/commit/1e0a22db5c7c336b1e663b8dfd7ee6192f35030f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-09T17:05:53-04:00

Commit Message:
TITANIC: Fix occassional PET mixup when toggling nav helmet on & off

Changed paths:
    engines/titanic/game/nav_helmet.cpp


diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 8002eeb..c2496be 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -48,15 +48,15 @@ void CNavHelmet::load(SimpleFile *file) {
 }
 
 bool CNavHelmet::MovieEndMsg(CMovieEndMsg *msg) {
-	if (_flag) {
+	CPetControl *pet = getPetControl();
+	assert(pet);
+
+	if (_flag && pet->isAreaUnlocked()) {
 		setVisible(false);
 
-		CPetControl *pet = getPetControl();
-		if (pet) {
-			pet->setArea(PET_STARFIELD);
-			petDisplayMessage(1, ADJUST_VIEWING_APPARATUS);
-			pet->incAreaLocks();
-		}
+		pet->setArea(PET_STARFIELD);
+		petDisplayMessage(1, ADJUST_VIEWING_APPARATUS);
+		pet->incAreaLocks();
 
 		starFn(STAR_SHOW);
 		starFn(STAR_12);