[Scummvm-git-logs] scummvm master -> 476513389297786021743e16de777e99e0fea709

[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:
4765133892 TITANIC: Fix display of current location outside SGT rooms


Commit: 476513389297786021743e16de777e99e0fea709
    https://github.com/scummvm/scummvm/commit/476513389297786021743e16de777e99e0fea709
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-12T18:37:48-05:00

Commit Message:
TITANIC: Fix display of current location outside SGT rooms

Changed paths:
    engines/titanic/game/pet/pet_position.cpp
    engines/titanic/room_flags.cpp



diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp
index db6f999..1dbedc4 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 1be0b0a..be9acb9 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;