[Scummvm-git-logs] scummvm master -> 90fed956f29dfda4e5ce210a76ca0c5bbfb70b28

[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:
90fed956f2 TITANIC: Fix highlighting correct PET icon after loading


Commit: 90fed956f29dfda4e5ce210a76ca0c5bbfb70b28
    https://github.com/scummvm/scummvm/commit/90fed956f29dfda4e5ce210a76ca0c5bbfb70b28
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-07T20:58:45-05:00

Commit Message:
TITANIC: Fix highlighting correct PET icon after loading

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



diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 3c3efe1..2d44885 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -155,7 +155,7 @@ void CPetControl::postLoad() {
 	if (!_remoteTargetName.empty() && root)
 		_remoteTarget = dynamic_cast<CGameObject *>(root->findByName(_remoteTargetName));
 
-	setArea(_currentArea);
+	setArea(_currentArea, true);
 	loaded();
 }
 
@@ -210,8 +210,8 @@ void CPetControl::resetActiveNPC() {
 	_activeNPCName = "";
 }
 
-PetArea CPetControl::setArea(PetArea newArea) {
-	if (newArea == _currentArea || !isAreaActive())
+PetArea CPetControl::setArea(PetArea newArea, bool forceChange) {
+	if ((!forceChange && newArea == _currentArea) || !isAreaActive())
 		return _currentArea;
 
 	// Signal the currently active area that it's being left
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index cdef505..d6f426b 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -181,7 +181,7 @@ public:
 	/**
 	 * Sets the currently viewed area within the PET
 	 */
-	PetArea setArea(PetArea newSection);
+	PetArea setArea(PetArea newSection, bool forceChange = false);
 
 	/**
 	 * Hides the text cursor in the current section, if applicable