diff options
Diffstat (limited to 'engines/titanic/pet_control/pet_control.cpp')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 423f87cd8c..55b2ecc24b 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) @@ -699,11 +699,11 @@ void CPetControl::resetDials0() { _conversations.resetDials0(); } -int CPetControl::getMailDest(const CRoomFlags &roomFlags) const { +PassengerClass CPetControl::getMailDestClass(const CRoomFlags &roomFlags) const { if (!roomFlags.isSuccUBusRoomFlags()) - return (int)roomFlags.getPassengerClassNum(); + return roomFlags.getPassengerClassNum(); - return roomFlags.getSuccUBusNum(roomFlags.getSuccUBusRoomName()); + return roomFlags.getSuccUBusClass(roomFlags.getSuccUBusRoomName()); } void CPetControl::starsSetButtons(int val1, int val2) { |