ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TITANIC: Fix highlighting correct PET icon after loading

Browse Source
This commit is contained in:
Paul Gilbert
2016-11-07 20:58:45 -05:00
parent 8eb8e7366c
commit 90fed956f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/titanic/pet_control/pet_control.cpp
+3 -3
View File
@@ -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
engines/titanic/pet_control/pet_control.h
+1 -1
View File
@@ -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