diff options
Diffstat (limited to 'engines/titanic/pet_control')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_control.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 423f87cd8c..b7fece7569 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -212,7 +212,7 @@ void CPetControl::resetActiveNPC() { } PetArea CPetControl::setArea(PetArea newArea, bool forceChange) { - if ((!forceChange && newArea == _currentArea) || !isAreaActive()) + if ((!forceChange && newArea == _currentArea) || !isAreaUnlocked()) return _currentArea; // Signal the currently active area that it's being left @@ -271,7 +271,7 @@ bool CPetControl::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { return false; bool result = false; - if (isAreaActive()) + if (isAreaUnlocked()) result = _frame.MouseButtonDownMsg(msg); if (!result) { @@ -302,7 +302,7 @@ bool CPetControl::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { return false; bool result = false; - if (isAreaActive()) + if (isAreaUnlocked()) result = _frame.MouseButtonUpMsg(msg); if (!result) diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 34d1330b52..af5ceb0a2a 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -354,7 +354,7 @@ public: /** * Returns true if the PET is currently unlocked */ - bool isAreaActive() const { return _areaLockCount == 0; } + bool isAreaUnlocked() const { return _areaLockCount == 0; } /** * Increment the number of PET area (tab) locks |