TITANIC: Only allow moving to SGT TV in assigned room

2 files changed, 13 insertions, 6 deletions

diff --git a/engines/titanic/game/ear_sweet_bowl.cpp b/engines/titanic/game/ear_sweet_bowl.cpp
index 387392b26d..e9190c337a 100644
--- a/engines/titanic/game/ear_sweet_bowl.cpp
+++ b/engines/titanic/game/ear_sweet_bowl.cpp
@@ -49,7 +49,7 @@ bool CEarSweetBowl::MovieEndMsg(CMovieEndMsg *msg) {
 	if (!doneMsg._value) {
 		CPetControl *pet = getPetControl();
 		if (pet)
-			pet->hasRoomFlags();
+			pet->isInAssignedRoom();
 
 		CIsParrotPresentMsg parrotMsg;
 		parrotMsg.execute(findRoom());
diff --git a/engines/titanic/game/sgt/sgt_nav.cpp b/engines/titanic/game/sgt/sgt_nav.cpp
index 3be92b4828..904ce64217 100644
--- a/engines/titanic/game/sgt/sgt_nav.cpp
+++ b/engines/titanic/game/sgt/sgt_nav.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/sgt/sgt_nav.h"
+#include "titanic/pet_control/pet_control.h"
 
 namespace Titanic {
 
@@ -43,7 +44,9 @@ bool SGTNav::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	CTurnOn onMsg;
 	CTurnOff offMsg;
 
-	if (_statics->_chestOfDrawers == "Open" && _statics->_bedhead == "Open") {
+	CPetControl *pet = getPetControl();
+	if (_statics->_chestOfDrawers == "Open" && _statics->_bedhead == "Open"
+			&& pet->isInAssignedRoom()) {
 		if (_statics->_vase == "Open")
 			offMsg.execute("Vase");
 		if (_statics->_tv == "Closed")
@@ -68,10 +71,14 @@ bool SGTNav::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 }
 
 bool SGTNav::MouseMoveMsg(CMouseMoveMsg *msg) {
-	if (_statics->_chestOfDrawers == "Open" && _statics->_bedhead == "Open")
-		_cursorId = CURSOR_MOVE_FORWARD;
-	else
-		_cursorId = CURSOR_ARROW;
+	_cursorId = CURSOR_ARROW;
+
+	if (_statics->_chestOfDrawers == "Open" && _statics->_bedhead == "Open") {
+		CPetControl *pet = getPetControl();
+		if (pet->isInAssignedRoom()) {
+			_cursorId = CURSOR_MOVE_FORWARD;
+		}
+	}
 
 	return true;
 }