diff options
| author | Paul Gilbert | 2017-09-09 17:05:53 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-09 17:05:53 -0400 |
| commit | 1e0a22db5c7c336b1e663b8dfd7ee6192f35030f (patch) | |
| tree | c0cd892a934ef3e6ab7ed1c97404a29729e29c33 /engines/titanic/game/nav_helmet.cpp | |
| parent | 635f189b9c04494f03293dc76d0d7587e7dcd641 (diff) | |
| download | scummvm-rg350-1e0a22db5c7c336b1e663b8dfd7ee6192f35030f.tar.gz scummvm-rg350-1e0a22db5c7c336b1e663b8dfd7ee6192f35030f.tar.bz2 scummvm-rg350-1e0a22db5c7c336b1e663b8dfd7ee6192f35030f.zip | |
TITANIC: Fix occassional PET mixup when toggling nav helmet on & off
Diffstat (limited to 'engines/titanic/game/nav_helmet.cpp')
| -rw-r--r-- | engines/titanic/game/nav_helmet.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp index 8002eebcb5..c2496be2a2 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); |