aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-12 18:37:48 -0500
committerPaul Gilbert2016-11-12 18:37:48 -0500
commit476513389297786021743e16de777e99e0fea709 (patch)
treea505ee13c420e68aa97eeb9d43576dc2977bc103
parent2f406c0fd81e643e5e0331e75624189e3509ad83 (diff)
downloadscummvm-rg350-476513389297786021743e16de777e99e0fea709.tar.gz
scummvm-rg350-476513389297786021743e16de777e99e0fea709.tar.bz2
scummvm-rg350-476513389297786021743e16de777e99e0fea709.zip
TITANIC: Fix display of current location outside SGT rooms
-rw-r--r--engines/titanic/game/pet/pet_position.cpp1
-rw-r--r--engines/titanic/room_flags.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp
index db6f9997c9..1dbedc4404 100644
--- a/engines/titanic/game/pet/pet_position.cpp
+++ b/engines/titanic/game/pet/pet_position.cpp
@@ -155,6 +155,7 @@ bool CPETPosition::EnterViewMsg(CEnterViewMsg *msg) {
if (pet) {
pet->setRooms1CC(1);
pet->setRoomsRoomNum(roomNum);
+ pet->resetRoomsHighlight();
if (viewStr == "Node 1.S")
pet->setRoomsWellEntry(pet->getRoomsElevatorNum());
diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
index 1be0b0aef6..be9acb9627 100644
--- a/engines/titanic/room_flags.cpp
+++ b/engines/titanic/room_flags.cpp
@@ -92,7 +92,7 @@ bool CRoomFlags::isTransportRoom() const {
}
int CRoomFlags::getRoomCategory() const {
- if (getRoomNum() == 0)
+ if (getRoomNum() != 0)
return false;
CRoomFlags tempFlags = _data;